diff --git a/.gitignore b/.gitignore index 5befbdf06..8a012047e 100644 --- a/.gitignore +++ b/.gitignore @@ -87,15 +87,20 @@ /bin/ICSharpCode.SharpDevelop.dll /bin/ICSharpCode.SharpDevelop.Dom.dll /bin/ICSharpCode.SharpDevelop.Widgets.dll -/bin/ICSharpCode.SharpZipLib.dll /bin/ICSharpCode.TextEditor.dll /bin/ICSharpCode.TextEditorLinux.dll -/bin/Mono.Cecil.dll -/bin/SharpDisasm.dll /bin/WeifenLuo.WinFormsUI.Docking.dll /bin/WeifenLuo.WinFormsUI.DockingLinux.dll /bin/WeifenLuo.WinFormsUI.Docking.ThemeVS2005.dll /bin/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll + +# from nuget +/bin/ICSharpCode.SharpZipLib.dll +/bin/SharpDisasm.dll +/bin/Mono.Cecil.dll +/bin/Mono.Cecil.Mdb.dll +/bin/Mono.Cecil.Pdb.dll +/bin/Mono.Cecil.Rocks.dll /bin/Microsoft.Bcl.HashCode.dll /bin/System.Buffers.dll /bin/System.Collections.Immutable.dll diff --git a/Libraries/ICSharpCode.SharpZipLib.dll b/Libraries/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index 8a9043c7c..000000000 Binary files a/Libraries/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/Libraries/SharpDisasm.dll b/Libraries/SharpDisasm.dll deleted file mode 100644 index a86611411..000000000 Binary files a/Libraries/SharpDisasm.dll and /dev/null differ diff --git a/ReleaseGenerators/sect_Core.nsh b/ReleaseGenerators/sect_Core.nsh index 975cfc167..c8afa344f 100644 --- a/ReleaseGenerators/sect_Core.nsh +++ b/ReleaseGenerators/sect_Core.nsh @@ -27,10 +27,14 @@ File "..\bin\ICSharpCode.SharpDevelop.Widgets.dll" File "..\bin\ControlLibrary.sdcl" File "..\bin\AvalonDock.dll" - File "..\bin\Mono.Cecil.dll" File "..\bin\TeacherControlPlugin.dll" File "..\bin\LambdaAnySynToSemConverter.dll" + File "..\bin\SharpDisasm.dll" + File "..\bin\Mono.Cecil.dll" + File "..\bin\Mono.Cecil.Mdb.dll" + File "..\bin\Mono.Cecil.Pdb.dll" + File "..\bin\Mono.Cecil.Rocks.dll" File "..\bin\Microsoft.Bcl.HashCode.dll" File "..\bin\System.Buffers.dll" File "..\bin\System.Collections.Immutable.dll" diff --git a/ReleaseGenerators/sect_VisualPABCNET.nsh b/ReleaseGenerators/sect_VisualPABCNET.nsh index 33fd4e3e1..943478f76 100644 --- a/ReleaseGenerators/sect_VisualPABCNET.nsh +++ b/ReleaseGenerators/sect_VisualPABCNET.nsh @@ -7,7 +7,6 @@ File "..\bin\PascalABCNET.exe" ;File "..\bin\PascalABCNET.exe.manifest" File "..\bin\Debugger.Core.dll" - File "..\bin\SharpDisasm.dll" File "..\bin\PascalABCNET.chm" File "..\bin\CodeCompletion.dll" File "..\bin\WeifenLuo.WinFormsUI.Docking.dll" diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 24d77f027..a738a1523 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -74,10 +74,7 @@ ..\..\..\..\..\Libs\ICSharpCode.SharpDevelop.Widgets.dll - - ..\..\..\..\..\Libs\Mono.Cecil.dll - - + @@ -85,6 +82,10 @@ + + + + diff --git a/VisualPascalABCNET/FormsDesignerBinding/Libs/Mono.Cecil.dll b/VisualPascalABCNET/FormsDesignerBinding/Libs/Mono.Cecil.dll deleted file mode 100644 index 9fa767dd3..000000000 Binary files a/VisualPascalABCNET/FormsDesignerBinding/Libs/Mono.Cecil.dll and /dev/null differ diff --git a/VisualPascalABCNET/VisualPascalABCNET.csproj b/VisualPascalABCNET/VisualPascalABCNET.csproj index daeb804a3..9e3189523 100644 --- a/VisualPascalABCNET/VisualPascalABCNET.csproj +++ b/VisualPascalABCNET/VisualPascalABCNET.csproj @@ -697,6 +697,7 @@ + @@ -718,9 +719,6 @@ - - ..\Libraries\SharpDisasm.dll - diff --git a/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj b/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj index 471b130f6..a58e1ef2b 100644 --- a/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj +++ b/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj @@ -819,9 +819,6 @@ - - ..\Libraries\SharpDisasm.dll - @@ -844,5 +841,6 @@ + \ No newline at end of file diff --git a/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj b/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj index c8762e896..b2d86f3af 100644 --- a/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj +++ b/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj @@ -23,14 +23,12 @@ - - ..\..\Libraries\ICSharpCode.SharpZipLib.dll - + \ No newline at end of file diff --git a/_GenerateLinuxVersion.bat b/_GenerateLinuxVersion.bat index 632990553..8993ce587 100644 --- a/_GenerateLinuxVersion.bat +++ b/_GenerateLinuxVersion.bat @@ -21,7 +21,6 @@ copy bin\ICSharpCode.SharpDevelop.dll Release\PascalABCNETLinux\ICSharpCode.Shar copy bin\ICSharpCode.SharpDevelop.Dom.dll Release\PascalABCNETLinux\ICSharpCode.SharpDevelop.Dom.dll copy bin\ICSharpCode.TextEditorLinux.dll Release\PascalABCNETLinux\ICSharpCode.TextEditorLinux.dll copy bin\Localization.dll Release\PascalABCNETLinux\Localization.dll -copy bin\Mono.Cecil.dll Release\PascalABCNETLinux\Mono.Cecil.dll copy bin\mono_pabcIDE.bat Release\PascalABCNETLinux\mono_pabcIDE.bat copy bin\mono_pabcnetc.bat Release\PascalABCNETLinux\mono_pabcnetc.bat copy bin\NETGenerator.dll Release\PascalABCNETLinux\NETGenerator.dll @@ -30,6 +29,10 @@ copy bin\LanguageIntegrator.dll Release\PascalABCNETLinux\LanguageIntegrator.dll copy bin\StringConstants.dll Release\PascalABCNETLinux\StringConstants.dll copy bin\SharpDisasm.dll Release\SharpDisasm.dll +copy bin\Mono.Cecil.dll Release\PascalABCNETLinux\Mono.Cecil.dll +copy bin\Mono.Cecil.Mdb.dll Release\Mono.Cecil.Mdb.dll +copy bin\Mono.Cecil.Pdb.dll Release\Mono.Cecil.Pdb.dll +copy bin\Mono.Cecil.Rocks.dll Release\Mono.Cecil.Rocks.dll copy bin\Microsoft.Bcl.HashCode.dll Release\PascalABCNETLinux\Microsoft.Bcl.HashCode.dll copy bin\System.Buffers.dll Release\PascalABCNETLinux\System.Buffers.dll copy bin\System.Collections.Immutable.dll Release\PascalABCNETLinux\System.Collections.Immutable.dll