From 7a29642b35fe199b6781a2af4df4ebf9cd50c53b Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Thu, 19 May 2016 07:31:19 +0200 Subject: [PATCH] Revert "use mono.cecil nuget-package in all projects instead of git sub-module" This reverts commit 6c1efaa2d78d8d36d09b0f1baa006f371708dcc6. --- ICSharpCode.Decompiler/Ast/AstBuilder.cs | 14 +++++------ .../ICSharpCode.Decompiler.csproj | 6 ++--- ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs | 14 +++++------ .../Tests/ICSharpCode.Decompiler.Tests.csproj | 16 ++++++------- ICSharpCode.Decompiler/Tests/packages.config | 1 - ICSharpCode.Decompiler/packages.config | 2 +- ILSpy.AddIn/ILSpy.AddIn.csproj | 16 ++++++------- ILSpy.AddIn/packages.config | 1 - .../ILSpy.BamlDecompiler.csproj | 10 ++++---- .../Tests/ILSpy.BamlDecompiler.Tests.csproj | 12 ++++------ ILSpy.BamlDecompiler/Tests/packages.config | 4 ---- ILSpy.BamlDecompiler/packages.config | 4 ---- ILSpy.sln | 24 +++++++++++++++++-- ILSpy/ILSpy.csproj | 17 +++++++------ ILSpy/packages.config | 4 ---- TestPlugin/TestPlugin.csproj | 9 ++++--- TestPlugin/packages.config | 4 ---- cecil | 1 + 18 files changed, 78 insertions(+), 81 deletions(-) delete mode 100644 ILSpy.BamlDecompiler/Tests/packages.config delete mode 100644 ILSpy.BamlDecompiler/packages.config delete mode 100644 ILSpy/packages.config delete mode 100644 TestPlugin/packages.config create mode 160000 cecil diff --git a/ICSharpCode.Decompiler/Ast/AstBuilder.cs b/ICSharpCode.Decompiler/Ast/AstBuilder.cs index 43e278c47b..aa97dc9bfc 100644 --- a/ICSharpCode.Decompiler/Ast/AstBuilder.cs +++ b/ICSharpCode.Decompiler/Ast/AstBuilder.cs @@ -181,7 +181,7 @@ public void AddAssembly(ModuleDefinition moduleDefinition, bool onlyAssemblyLeve Type = new SimpleType("AssemblyVersion") .WithAnnotation(new TypeReference( "System.Reflection", "AssemblyVersionAttribute", - moduleDefinition, moduleDefinition.TypeSystem.Corlib)), + moduleDefinition, moduleDefinition.TypeSystem.CoreLibrary)), Arguments = { new PrimitiveExpression(moduleDefinition.Assembly.Name.Version.ToString()) } @@ -225,7 +225,7 @@ void AddTypeForwarderAttributes(SyntaxTree astCompileUnit, ModuleDefinition modu Type = new SimpleType("TypeForwardedTo") .WithAnnotation(new TypeReference( "System.Runtime.CompilerServices", "TypeForwardedToAttribute", - module, module.TypeSystem.Corlib)), + module, module.TypeSystem.CoreLibrary)), Arguments = { forwardedType } } } @@ -1264,7 +1264,7 @@ void ConvertAttributes(EntityDeclaration attributedNode, MethodDefinition method Ast.Attribute methodImpl = CreateNonCustomAttribute(typeof(MethodImplAttribute)); TypeReference methodImplOptions = new TypeReference( "System.Runtime.CompilerServices", "MethodImplOptions", - methodDefinition.Module, methodDefinition.Module.TypeSystem.Corlib); + methodDefinition.Module, methodDefinition.Module.TypeSystem.CoreLibrary); methodImpl.Arguments.Add(MakePrimitive((long)implAttributes, methodImplOptions)); attributedNode.Attributes.Add(new AttributeSection(methodImpl)); } @@ -1311,7 +1311,7 @@ static Ast.Attribute ConvertMarshalInfo(IMarshalInfoProvider marshalInfoProvider { MarshalInfo marshalInfo = marshalInfoProvider.MarshalInfo; Ast.Attribute attr = CreateNonCustomAttribute(typeof(MarshalAsAttribute), module); - var unmanagedType = new TypeReference("System.Runtime.InteropServices", "UnmanagedType", module, module.TypeSystem.Corlib); + var unmanagedType = new TypeReference("System.Runtime.InteropServices", "UnmanagedType", module, module.TypeSystem.CoreLibrary); attr.Arguments.Add(MakePrimitive((int)marshalInfo.NativeType, unmanagedType)); FixedArrayMarshalInfo fami = marshalInfo as FixedArrayMarshalInfo; @@ -1322,7 +1322,7 @@ static Ast.Attribute ConvertMarshalInfo(IMarshalInfoProvider marshalInfoProvider } SafeArrayMarshalInfo sami = marshalInfo as SafeArrayMarshalInfo; if (sami != null && sami.ElementType != VariantType.None) { - var varEnum = new TypeReference("System.Runtime.InteropServices", "VarEnum", module, module.TypeSystem.Corlib); + var varEnum = new TypeReference("System.Runtime.InteropServices", "VarEnum", module, module.TypeSystem.CoreLibrary); attr.AddNamedArgument("SafeArraySubType", MakePrimitive((int)sami.ElementType, varEnum)); } ArrayMarshalInfo ami = marshalInfo as ArrayMarshalInfo; @@ -1359,7 +1359,7 @@ static Ast.Attribute CreateNonCustomAttribute(Type attributeType, ModuleDefiniti Ast.Attribute attr = new Ast.Attribute(); attr.Type = new SimpleType(attributeType.Name.Substring(0, attributeType.Name.Length - "Attribute".Length)); if (module != null) { - attr.Type.AddAnnotation(new TypeReference(attributeType.Namespace, attributeType.Name, module, module.TypeSystem.Corlib)); + attr.Type.AddAnnotation(new TypeReference(attributeType.Namespace, attributeType.Name, module, module.TypeSystem.CoreLibrary)); } return attr; } @@ -1461,7 +1461,7 @@ static void ConvertSecurityAttributes(AstNode attributedNode, ISecurityDeclarati } var module = secAttribute.AttributeType.Module; - var securityActionType = new TypeReference("System.Security.Permissions", "SecurityAction", module, module.TypeSystem.Corlib); + var securityActionType = new TypeReference("System.Security.Permissions", "SecurityAction", module, module.TypeSystem.CoreLibrary); attribute.Arguments.Add(MakePrimitive((int)secDecl.Action, securityActionType)); if (secAttribute.HasProperties) { diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index b0bdda4a1a..99b6693f02 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -51,9 +51,8 @@ ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.CSharp.dll - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll - True + + ..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll @@ -137,7 +136,6 @@ - diff --git a/ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs b/ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs index a507ebcc21..f1e47f3d20 100644 --- a/ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs +++ b/ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs @@ -478,7 +478,7 @@ TypeReference DoInferTypeForExpression(ILExpression expr, TypeReference expected if (forceInferChildren) { InferTypeForExpression(expr.Arguments[0], typeSystem.TypedReference); } - return new TypeReference("System", "RuntimeTypeHandle", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "RuntimeTypeHandle", module, module.TypeSystem.CoreLibrary, true); case ILCode.Refanyval: if (forceInferChildren) { InferTypeForExpression(expr.Arguments[0], typeSystem.TypedReference); @@ -607,16 +607,16 @@ TypeReference DoInferTypeForExpression(ILExpression expr, TypeReference expected case ILCode.Ldc_R8: return typeSystem.Double; case ILCode.Ldc_Decimal: - return new TypeReference("System", "Decimal", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "Decimal", module, module.TypeSystem.CoreLibrary, true); case ILCode.Ldtoken: if (expr.Operand is TypeReference) - return new TypeReference("System", "RuntimeTypeHandle", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "RuntimeTypeHandle", module, module.TypeSystem.CoreLibrary, true); else if (expr.Operand is FieldReference) - return new TypeReference("System", "RuntimeFieldHandle", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "RuntimeFieldHandle", module, module.TypeSystem.CoreLibrary, true); else - return new TypeReference("System", "RuntimeMethodHandle", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "RuntimeMethodHandle", module, module.TypeSystem.CoreLibrary, true); case ILCode.Arglist: - return new TypeReference("System", "RuntimeArgumentHandle", module, module.TypeSystem.Corlib, true); + return new TypeReference("System", "RuntimeArgumentHandle", module, module.TypeSystem.CoreLibrary, true); #endregion #region Array instructions case ILCode.Newarr: @@ -996,7 +996,7 @@ static TypeReference GetNullableTypeArgument(TypeReference type) GenericInstanceType CreateNullableType(TypeReference type) { if (type == null) return null; - var t = new GenericInstanceType(new TypeReference("System", "Nullable`1", module, module.TypeSystem.Corlib, true)); + var t = new GenericInstanceType(new TypeReference("System", "Nullable`1", module, module.TypeSystem.CoreLibrary, true)); t.GenericArguments.Add(type); return t; } diff --git a/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj index e8abd4d80a..4212a76b6f 100644 --- a/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj @@ -49,14 +49,6 @@ ..\..\packages\DiffLib.1.0.0.55\lib\net35-Client\DiffLib.dll - - ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll - True - - - ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll - True - ..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll False @@ -141,6 +133,14 @@ + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + + + {63e6915c-7ea4-4d76-ab28-0d7191eea626} + Mono.Cecil.Pdb + {53dca265-3c3c-42f9-b647-f72ba678122b} ICSharpCode.NRefactory.CSharp diff --git a/ICSharpCode.Decompiler/Tests/packages.config b/ICSharpCode.Decompiler/Tests/packages.config index 6f1df33573..44cab44957 100644 --- a/ICSharpCode.Decompiler/Tests/packages.config +++ b/ICSharpCode.Decompiler/Tests/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/ICSharpCode.Decompiler/packages.config b/ICSharpCode.Decompiler/packages.config index 05339f37a2..ade7de76c5 100644 --- a/ICSharpCode.Decompiler/packages.config +++ b/ICSharpCode.Decompiler/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj index 54e40e24e1..b56546a98f 100644 --- a/ILSpy.AddIn/ILSpy.AddIn.csproj +++ b/ILSpy.AddIn/ILSpy.AddIn.csproj @@ -91,14 +91,6 @@ False ..\packages\VSSDK.TextManager.Interop.8.8.0.3\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll - True - - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.Pdb.dll - True - @@ -216,6 +208,14 @@ {1e85eff9-e370-4683-83e4-8a3d063ff791} ILSpy + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + + + {63e6915c-7ea4-4d76-ab28-0d7191eea626} + Mono.Cecil.Pdb + {53dca265-3c3c-42f9-b647-f72ba678122b} ICSharpCode.NRefactory.CSharp diff --git a/ILSpy.AddIn/packages.config b/ILSpy.AddIn/packages.config index 41f80f5a40..14a0983657 100644 --- a/ILSpy.AddIn/packages.config +++ b/ILSpy.AddIn/packages.config @@ -1,6 +1,5 @@  - diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj index 2d9565d5ae..2abd844e5d 100644 --- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj +++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj @@ -44,10 +44,6 @@ TRACE - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll - True - 3.0 @@ -119,6 +115,11 @@ ILSpy False + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + False + {dde2a481-8271-4eac-a330-8fa6a38d13d1} ICSharpCode.TreeView @@ -126,7 +127,6 @@ - diff --git a/ILSpy.BamlDecompiler/Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler/Tests/ILSpy.BamlDecompiler.Tests.csproj index 46524b8257..938d0ab27d 100644 --- a/ILSpy.BamlDecompiler/Tests/ILSpy.BamlDecompiler.Tests.csproj +++ b/ILSpy.BamlDecompiler/Tests/ILSpy.BamlDecompiler.Tests.csproj @@ -45,10 +45,6 @@ ..\..\packages\DiffLib.1.0.0.55\lib\net35-Client\DiffLib.dll - - ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll - True - ..\..\ICSharpCode.Decompiler\Tests\nunit.framework.dll @@ -108,6 +104,10 @@ {1e85eff9-e370-4683-83e4-8a3d063ff791} ILSpy + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + {dde2a481-8271-4eac-a330-8fa6a38d13d1} ICSharpCode.TreeView @@ -117,9 +117,7 @@ ILSpy.BamlDecompiler - - - + diff --git a/ILSpy.BamlDecompiler/Tests/packages.config b/ILSpy.BamlDecompiler/Tests/packages.config deleted file mode 100644 index e304cab94e..0000000000 --- a/ILSpy.BamlDecompiler/Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ILSpy.BamlDecompiler/packages.config b/ILSpy.BamlDecompiler/packages.config deleted file mode 100644 index d1ba751500..0000000000 --- a/ILSpy.BamlDecompiler/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ILSpy.sln b/ILSpy.sln index 09a5c323ad..dad0c93a0b 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 2012 # SharpDevelop 5.1 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E72-4000-B5AD-3A7B485A0896}" ProjectSection(SolutionItems) = preProject @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy", "ILSpy\ILSpy.csproj EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" @@ -23,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler.Test EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler", "ILSpy.BamlDecompiler\ILSpy.BamlDecompiler.csproj", "{A6BAD2BA-76BA-461C-8B6D-418607591247}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpy.BamlDecompiler.Tests", "ILSpy.BamlDecompiler\Tests\ILSpy.BamlDecompiler.Tests.csproj", "{1169E6D1-1899-43D4-A500-07CE4235B388}" @@ -64,6 +68,14 @@ Global {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.ActiveCfg = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.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}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.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 + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Net40 {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|Net40 {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|x86.ActiveCfg = Debug|Net40 @@ -104,6 +116,14 @@ Global {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|Any CPU.Build.0 = Release|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|x86.ActiveCfg = Release|Any CPU {F32EBCC8-0E53-4421-867E-05B3D6E10C70}.Release|x86.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}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU + {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Debug|x86.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 + {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU + {63E6915C-7EA4-4D76-AB28-0D7191EEA626}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index ff56806d4a..243e2275a2 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -55,14 +55,6 @@ TRACE - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll - True - - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.Pdb.dll - True - 3.0 @@ -262,7 +254,6 @@ - @@ -380,10 +371,18 @@ {984cc812-9470-4a13-aff9-cc44068d666c} ICSharpCode.Decompiler + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + {6c55b776-26d4-4db3-a6ab-87e783b2f3d1} ICSharpCode.AvalonEdit + + {63e6915c-7ea4-4d76-ab28-0d7191eea626} + Mono.Cecil.Pdb + {7b82b671-419f-45f4-b778-d9286f996efa} ICSharpCode.NRefactory.VB diff --git a/ILSpy/packages.config b/ILSpy/packages.config deleted file mode 100644 index d1ba751500..0000000000 --- a/ILSpy/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj index e6b5a5da0d..38230e7a85 100644 --- a/TestPlugin/TestPlugin.csproj +++ b/TestPlugin/TestPlugin.csproj @@ -43,10 +43,6 @@ bin\Release\ILSpy.exe - - ..\packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll - True - 3.0 @@ -83,7 +79,6 @@ - @@ -95,6 +90,10 @@ {1e85eff9-e370-4683-83e4-8a3d063ff791} ILSpy + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + {53dca265-3c3c-42f9-b647-f72ba678122b} ICSharpCode.NRefactory.CSharp diff --git a/TestPlugin/packages.config b/TestPlugin/packages.config deleted file mode 100644 index c1fcbe0620..0000000000 --- a/TestPlugin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cecil b/cecil new file mode 160000 index 0000000000..53df0bc39e --- /dev/null +++ b/cecil @@ -0,0 +1 @@ +Subproject commit 53df0bc39e48d8544020856e83f8d8a2e11c8a3a