Browse Source

Remove the last traces of Mono.Cecil in ICSharpCode.Decompiler and ILSpy.

pull/1198/head
Siegfried Pammer 7 years ago
parent
commit
4aafe2db69
  1. 223
      ICSharpCode.Decompiler/CecilExtensions.cs
  2. 2
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  3. 2
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
  4. 47
      ICSharpCode.Decompiler/IL/ILTypeExtensions.cs
  5. 2
      ICSharpCode.Decompiler/IL/Instructions/Branch.cs
  6. 30
      ICSharpCode.Decompiler/IL/PrimitiveType.cs
  7. 2
      ILSpy.AddIn/Commands/OpenILSpyCommand.cs
  8. 2
      ILSpy.AddIn/Commands/OpenReferenceCommand.cs
  9. 4
      ILSpy.AddIn/ILSpyAddInPackage.cs
  10. 1
      ILSpy.BamlDecompiler/CecilType.cs
  11. 12
      ILSpy.sln
  12. 5
      ILSpy/ExtensionMethods.cs
  13. 3
      ILSpy/GacInterop.cs
  14. 4
      ILSpy/ILSpy.csproj
  15. 2
      ILSpy/Languages/CSharpILMixedLanguage.cs
  16. 1
      ILSpy/NugetPackageBrowserDialog.xaml.cs
  17. 3
      ILSpy/OpenFromGacDialog.xaml.cs
  18. 2
      ILSpy/OpenListDialog.xaml.cs
  19. 8
      ILSpy/Properties/app.config.template
  20. 1
      ILSpy/SearchPane.cs

223
ICSharpCode.Decompiler/CecilExtensions.cs

@ -1,223 +0,0 @@ @@ -1,223 +0,0 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using Mono.Cecil;
using Mono.Cecil.Cil;
using ArrayType = Mono.Cecil.ArrayType;
namespace ICSharpCode.Decompiler
{
/// <summary>
/// Cecil helper methods.
/// </summary>
public static class CecilExtensions
{
public static string OffsetToString(int offset)
{
return string.Format("IL_{0:x4}", offset);
}
public static string OffsetToString(long offset)
{
return string.Format("IL_{0:x4}", offset);
}
public static FieldDefinition ResolveWithinSameModule(this FieldReference field)
{
if (field != null && field.DeclaringType.GetElementType().Module == field.Module)
return field.Resolve();
else
return null;
}
public static MethodDefinition ResolveWithinSameModule(this MethodReference method)
{
if (method != null && method.DeclaringType.GetElementType().Module == method.Module)
return method.Resolve();
else
return null;
}
public static TypeDefinition ResolveOrThrow(this TypeReference typeReference)
{
var resolved = typeReference.Resolve();
if (resolved == null)
throw new ReferenceResolvingException();
return resolved;
}
public static bool IsCompilerGenerated(this ICustomAttributeProvider provider)
{
if (provider != null && provider.HasCustomAttributes) {
foreach (CustomAttribute a in provider.CustomAttributes) {
if (a.AttributeType.FullName == "System.Runtime.CompilerServices.CompilerGeneratedAttribute")
return true;
}
}
return false;
}
public static bool IsCompilerGeneratedOrIsInCompilerGeneratedClass(this IMemberDefinition member)
{
if (member == null)
return false;
if (member.IsCompilerGenerated())
return true;
return IsCompilerGeneratedOrIsInCompilerGeneratedClass(member.DeclaringType);
}
public static TypeReference GetEnumUnderlyingType(this TypeDefinition type)
{
if (!type.IsEnum)
throw new ArgumentException("Type must be an enum", nameof(type));
var fields = type.Fields;
for (int i = 0; i < fields.Count; i++)
{
var field = fields[i];
if (!field.IsStatic)
return field.FieldType;
}
throw new NotSupportedException();
}
public static bool IsAnonymousType(this TypeReference type)
{
if (type == null)
return false;
if (string.IsNullOrEmpty(type.Namespace) && type.HasGeneratedName() && (type.Name.Contains("AnonType") || type.Name.Contains("AnonymousType"))) {
TypeDefinition td = type.Resolve();
return td != null && td.IsCompilerGenerated();
}
return false;
}
public static bool HasGeneratedName(this MemberReference member)
{
return member.Name.StartsWith("<", StringComparison.Ordinal);
}
public static bool ContainsAnonymousType(this TypeReference type)
{
GenericInstanceType git = type as GenericInstanceType;
if (git != null) {
if (IsAnonymousType(git))
return true;
for (int i = 0; i < git.GenericArguments.Count; i++) {
if (git.GenericArguments[i].ContainsAnonymousType())
return true;
}
return false;
}
TypeSpecification typeSpec = type as TypeSpecification;
if (typeSpec != null)
return typeSpec.ElementType.ContainsAnonymousType();
else
return false;
}
public static string GetDefaultMemberName(this TypeDefinition type)
{
CustomAttribute attr;
return type.GetDefaultMemberName(out attr);
}
public static string GetDefaultMemberName(this TypeDefinition type, out CustomAttribute defaultMemberAttribute)
{
if (type.HasCustomAttributes)
foreach (CustomAttribute ca in type.CustomAttributes)
if (ca.Constructor.DeclaringType.Name == "DefaultMemberAttribute" && ca.Constructor.DeclaringType.Namespace == "System.Reflection"
&& ca.Constructor.FullName == @"System.Void System.Reflection.DefaultMemberAttribute::.ctor(System.String)") {
defaultMemberAttribute = ca;
return ca.ConstructorArguments[0].Value as string;
}
defaultMemberAttribute = null;
return null;
}
public static bool IsIndexer(this PropertyDefinition property)
{
CustomAttribute attr;
return property.IsIndexer(out attr);
}
public static bool IsIndexer(this PropertyDefinition property, out CustomAttribute defaultMemberAttribute)
{
defaultMemberAttribute = null;
if (property.HasParameters) {
var accessor = property.GetMethod ?? property.SetMethod;
PropertyDefinition basePropDef = property;
if (accessor.HasOverrides) {
// if the property is explicitly implementing an interface, look up the property in the interface:
MethodDefinition baseAccessor = accessor.Overrides.First().Resolve();
if (baseAccessor != null) {
foreach (PropertyDefinition baseProp in baseAccessor.DeclaringType.Properties) {
if (baseProp.GetMethod == baseAccessor || baseProp.SetMethod == baseAccessor) {
basePropDef = baseProp;
break;
}
}
} else
return false;
}
CustomAttribute attr;
var defaultMemberName = basePropDef.DeclaringType.GetDefaultMemberName(out attr);
if (defaultMemberName == basePropDef.Name) {
defaultMemberAttribute = attr;
return true;
}
}
return false;
}
public static bool IsUnconditionalBranch(this OpCode opcode)
{
if (opcode.OpCodeType == OpCodeType.Prefix)
return false;
switch (opcode.FlowControl) {
case FlowControl.Branch:
case FlowControl.Throw:
case FlowControl.Return:
return true;
case FlowControl.Next:
case FlowControl.Call:
case FlowControl.Cond_Branch:
return false;
default:
throw new NotSupportedException(opcode.FlowControl.ToString());
}
}
public static bool IsDelegate(this TypeDefinition type)
{
if (type.BaseType != null && type.BaseType.Namespace == "System") {
if (type.BaseType.Name == "MulticastDelegate")
return true;
if (type.BaseType.Name == "Delegate" && type.Name != "MulticastDelegate")
return true;
}
return false;
}
}
}

2
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -51,7 +51,6 @@ @@ -51,7 +51,6 @@
<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
@ -397,7 +396,6 @@ @@ -397,7 +396,6 @@
<Compile Include="IL\Transforms\SplitVariables.cs" />
<Compile Include="IL\Transforms\Stepper.cs" />
<Compile Include="IL\Transforms\TransformArrayInitializers.cs" />
<Compile Include="CecilExtensions.cs" />
<Compile Include="Disassembler\DisassemblerHelpers.cs" />
<Compile Include="Disassembler\ILStructure.cs" />
<Compile Include="Disassembler\MethodBodyDisassembler.cs" />

2
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<tags>C# Decompiler ILSpy</tags>
<dependencies>
<dependency id="Humanizer.Core" version="2.2.0" />
<dependency id="Mono.Cecil" version="0.10.0-beta7" />
<dependency id="System.Reflection.Metadata" version="1.4.2" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.ValueTuple" version="4.3.0" />
</dependencies>

47
ICSharpCode.Decompiler/IL/ILTypeExtensions.cs

@ -16,53 +16,46 @@ @@ -16,53 +16,46 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using Mono.Cecil;
using ICSharpCode.Decompiler.TypeSystem;
using System.Reflection.Metadata;
namespace ICSharpCode.Decompiler.IL
{
static class ILTypeExtensions
{
public static StackType GetStackType(this MetadataType typeCode)
public static StackType GetStackType(this PrimitiveType primitiveType)
{
switch (typeCode) {
case MetadataType.Boolean:
case MetadataType.Char:
case MetadataType.SByte:
case MetadataType.Byte:
case MetadataType.Int16:
case MetadataType.UInt16:
case MetadataType.Int32:
case MetadataType.UInt32:
switch (primitiveType) {
case PrimitiveType.I1:
case PrimitiveType.U1:
case PrimitiveType.I2:
case PrimitiveType.U2:
case PrimitiveType.I4:
case PrimitiveType.U4:
return StackType.I4;
case MetadataType.Int64:
case MetadataType.UInt64:
case PrimitiveType.I8:
case PrimitiveType.U8:
return StackType.I8;
case MetadataType.IntPtr:
case MetadataType.UIntPtr:
case MetadataType.Pointer:
case MetadataType.FunctionPointer:
case PrimitiveType.I:
case PrimitiveType.U:
case (PrimitiveType)0x0f: // Ptr
case (PrimitiveType)0x1b: // FnPtr
return StackType.I;
case MetadataType.Single:
case PrimitiveType.R4:
return StackType.F4;
case MetadataType.Double:
case PrimitiveType.R8:
return StackType.F8;
case MetadataType.ByReference:
case (PrimitiveType)0x10: // ByRef
return StackType.Ref;
case MetadataType.Void:
case (PrimitiveType)0x01: // Void
return StackType.Void;
case (MetadataType)PrimitiveType.Unknown:
case PrimitiveType.Unknown:
return StackType.Unknown;
default:
return StackType.O;
}
}
public static StackType GetStackType(this PrimitiveType primitiveType)
{
return ((MetadataType)primitiveType).GetStackType();
}
public static Sign GetSign(this PrimitiveType primitiveType)
{
switch (primitiveType) {

2
ICSharpCode.Decompiler/IL/Instructions/Branch.cs

@ -80,7 +80,7 @@ namespace ICSharpCode.Decompiler.IL @@ -80,7 +80,7 @@ namespace ICSharpCode.Decompiler.IL
}
public string TargetLabel {
get { return targetBlock != null ? targetBlock.Label : CecilExtensions.OffsetToString(TargetILOffset); }
get { return targetBlock != null ? targetBlock.Label : string.Format("IL_{0:x4}", TargetILOffset); }
}
/// <summary>

30
ICSharpCode.Decompiler/IL/PrimitiveType.cs

@ -16,26 +16,26 @@ @@ -16,26 +16,26 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using Mono.Cecil;
using System.Reflection.Metadata;
namespace ICSharpCode.Decompiler.IL
{
public enum PrimitiveType : byte
{
None = 0,
I1 = MetadataType.SByte,
I2 = MetadataType.Int16,
I4 = MetadataType.Int32,
I8 = MetadataType.Int64,
R4 = MetadataType.Single,
R8 = MetadataType.Double,
U1 = MetadataType.Byte,
U2 = MetadataType.UInt16,
U4 = MetadataType.UInt32,
U8 = MetadataType.UInt64,
I = MetadataType.IntPtr,
U = MetadataType.UIntPtr,
Ref = MetadataType.ByReference,
None,
I1 = PrimitiveTypeCode.SByte,
I2 = PrimitiveTypeCode.Int16,
I4 = PrimitiveTypeCode.Int32,
I8 = PrimitiveTypeCode.Int64,
R4 = PrimitiveTypeCode.Single,
R8 = PrimitiveTypeCode.Double,
U1 = PrimitiveTypeCode.Byte,
U2 = PrimitiveTypeCode.UInt16,
U4 = PrimitiveTypeCode.UInt32,
U8 = PrimitiveTypeCode.UInt64,
I = PrimitiveTypeCode.IntPtr,
U = PrimitiveTypeCode.UIntPtr,
Ref = 16,
Unknown = 255
}
}

2
ILSpy.AddIn/Commands/OpenILSpyCommand.cs

@ -70,7 +70,7 @@ namespace ICSharpCode.ILSpy.AddIn.Commands @@ -70,7 +70,7 @@ namespace ICSharpCode.ILSpy.AddIn.Commands
foreach (var reference in parentProject.MetadataReferences) {
using (var assemblyDef = AssemblyDefinition.ReadAssembly(reference.Display)) {
if (IsReferenceAssembly(assemblyDef)) {
dict.Add(assemblyDef.Name.Name, GacInterop.FindAssemblyInNetGac(assemblyDef.Name));
dict.Add(assemblyDef.Name.Name, GacInterop.FindAssemblyInNetGac(Decompiler.Metadata.AssemblyNameReference.Parse(assemblyDef.FullName)));
} else {
dict.Add(assemblyDef.Name.Name, reference.Display);
}

2
ILSpy.AddIn/Commands/OpenReferenceCommand.cs

@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using EnvDTE;
using ICSharpCode.Decompiler.Metadata;
using Microsoft.CodeAnalysis;
using Mono.Cecil;
using VSLangProj;
namespace ICSharpCode.ILSpy.AddIn.Commands

4
ILSpy.AddIn/ILSpyAddInPackage.cs

@ -6,10 +6,6 @@ using System.ComponentModel.Design; @@ -6,10 +6,6 @@ using System.ComponentModel.Design;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Shell;
using System.IO;
using Mono.Cecil;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.ILSpy.AddIn.Commands;
using Microsoft.VisualStudio.ComponentModelHost;
using Microsoft.VisualStudio.LanguageServices;

1
ILSpy.BamlDecompiler/CecilType.cs

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
using System;
using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using Mono.Cecil;
using Ricciolo.StylesExplorer.MarkupReflection;
namespace ILSpy.BamlDecompiler

12
ILSpy.sln

@ -14,16 +14,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy", "ILSpy\ILSpy.csproj @@ -14,16 +14,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy", "ILSpy\ILSpy.csproj
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin", "TestPlugin\TestPlugin.csproj", "{F32EBCC8-0E53-4421-867E-05B3D6E10C70}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "cecil\symbols\pdb\Mono.Cecil.Pdb.csproj", "{63E6915C-7EA4-4D76-AB28-0D7191EEA626}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.BamlDecompiler", "ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj", "{A6BAD2BA-76BA-461C-8B6D-418607591247}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler.Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}"
@ -49,10 +45,6 @@ Global @@ -49,10 +45,6 @@ Global
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -65,10 +57,6 @@ Global @@ -65,10 +57,6 @@ Global
{F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|Any CPU.Build.0 = Release|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
{63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6BAD2BA-76BA-461C-8B6D-418607591247}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6BAD2BA-76BA-461C-8B6D-418607591247}.Release|Any CPU.ActiveCfg = Release|Any CPU

5
ILSpy/ExtensionMethods.cs

@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
using System;
using System.Collections.Generic;
using Mono.Cecil;
using ICSharpCode.ILSpy.Options;
namespace ICSharpCode.ILSpy
@ -88,7 +87,7 @@ namespace ICSharpCode.ILSpy @@ -88,7 +87,7 @@ namespace ICSharpCode.ILSpy
}
return ~start;
}
/*
public static bool IsCustomAttribute(this TypeDefinition type)
{
while (type.FullName != "System.Object") {
@ -101,7 +100,7 @@ namespace ICSharpCode.ILSpy @@ -101,7 +100,7 @@ namespace ICSharpCode.ILSpy
}
return false;
}
*/
public static string ToSuffixString(this System.Reflection.Metadata.EntityHandle token)
{
if (!DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens)

3
ILSpy/GacInterop.cs

@ -20,8 +20,7 @@ using System; @@ -20,8 +20,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using Mono.Cecil;
using ICSharpCode.Decompiler.Metadata;
namespace ICSharpCode.ILSpy
{

4
ILSpy/ILSpy.csproj

@ -75,7 +75,6 @@ @@ -75,7 +75,6 @@
<Compile Include="AssemblyListManager.cs" />
<Compile Include="AvalonEdit\ITextMarker.cs" />
<Compile Include="AvalonEdit\TextMarkerService.cs" />
<Compile Include="Cecil\CecilExtensions.cs" />
<Compile Include="Commands\CheckForUpdatesCommand.cs" />
<Compile Include="Commands\BrowseBackCommand.cs" />
<Compile Include="Commands\BrowseForwardCommand.cs" />
@ -381,8 +380,7 @@ @@ -381,8 +380,7 @@
<NuGetPackagesToCopy Include="$(TargetDir)System.Threading.Tasks.Dataflow.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)ICSharpCode.AvalonEdit.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)Humanizer.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)Mono.Cecil.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)Mono.Cecil.Pdb.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)System.Reflection.Metadata.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)Microsoft.VisualStudio.Composition.dll" />
<NuGetPackagesToCopy Include="$(TargetDir)Microsoft.VisualStudio.Validation.dll" />
</ItemGroup>

2
ILSpy/Languages/CSharpILMixedLanguage.cs

@ -16,8 +16,6 @@ using ICSharpCode.Decompiler.Disassembler; @@ -16,8 +16,6 @@ using ICSharpCode.Decompiler.Disassembler;
using ICSharpCode.Decompiler.IL;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
using Mono.Cecil;
using Mono.Cecil.Cil;
namespace ICSharpCode.ILSpy
{

1
ILSpy/NugetPackageBrowserDialog.xaml.cs

@ -29,7 +29,6 @@ using System.Windows.Controls; @@ -29,7 +29,6 @@ using System.Windows.Controls;
using System.Windows.Threading;
using ICSharpCode.ILSpy.Controls;
using Mono.Cecil;
namespace ICSharpCode.ILSpy
{

3
ILSpy/OpenFromGacDialog.xaml.cs

@ -26,9 +26,8 @@ using System.Threading; @@ -26,9 +26,8 @@ using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Threading;
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.ILSpy.Controls;
using Mono.Cecil;
namespace ICSharpCode.ILSpy
{

2
ILSpy/OpenListDialog.xaml.cs

@ -18,9 +18,9 @@ @@ -18,9 +18,9 @@
using System.Windows;
using System.Windows.Controls;
using Mono.Cecil;
using System.Windows.Input;
using System;
using ICSharpCode.Decompiler.Metadata;
namespace ICSharpCode.ILSpy
{

8
ILSpy/Properties/app.config.template

@ -37,14 +37,6 @@ @@ -37,14 +37,6 @@
<assemblyIdentity name="ILSpy" publicKeyToken="d4bfe873e7598c49" culture="neutral"/>
<bindingRedirect oldVersion="1.0.0.0-99.9.9.9" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="0.10.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil.Pdb" publicKeyToken="0738eb9f132ed756" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="0.10.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

1
ILSpy/SearchPane.cs

@ -28,7 +28,6 @@ using System.Windows.Media; @@ -28,7 +28,6 @@ using System.Windows.Media;
using System.Windows.Threading;
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.ILSpy.TreeNodes;
using Mono.Cecil;
namespace ICSharpCode.ILSpy
{

Loading…
Cancel
Save