From 84e19e2f7c7e69de24aec18e22c9df86bfcd780c Mon Sep 17 00:00:00 2001 From: Voloshin Bogdan Date: Fri, 11 Aug 2017 05:55:16 +0300 Subject: [PATCH] Move dll's from bin to Libraries --- Compiler/Compiler.csproj | 4 +-- {bin => Libraries}/AvalonDock.dll | Bin {bin => Libraries}/Debugger.Core.dll | Bin {bin => Libraries}/ICSharpCode.AvalonEdit.dll | Bin {bin => Libraries}/ICSharpCode.NRefactory.dll | Bin .../ICSharpCode.SharpZipLib.dll | Bin {bin => Libraries}/ICSharpCode.TextEditor.dll | Bin {bin => Libraries}/Microsoft.Dynamic.dll | Bin {bin => Libraries}/Microsoft.Scripting.dll | Bin {bin => Libraries}/Mono.Cecil.dll | Bin {bin => Libraries}/Mono.Debugger.Soft.dll | Bin {bin => Libraries}/Mono.Debugging.Soft.dll | Bin {bin => Libraries}/Mono.Debugging.dll | Bin {bin => Libraries}/PascalABCAspects.dll | Bin {bin => Libraries}/SharpDisasm.dll | Bin {bin => Libraries}/ShiftReduceParser.dll | Bin .../WeifenLuo.WinFormsUI.Docking.dll | Bin Localization/DefaultLang.resources | Bin 80949 -> 81007 bytes Parsers/VBNETParser/VBNETParser.csproj | 2 +- PluginsSupport/PluginsSupport.csproj | 4 ++- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNET/VisualPascalABCNET.csproj | 24 ++++++++---------- .../InternalErrorReport.csproj | 4 ++- 23 files changed, 21 insertions(+), 19 deletions(-) rename {bin => Libraries}/AvalonDock.dll (100%) rename {bin => Libraries}/Debugger.Core.dll (100%) rename {bin => Libraries}/ICSharpCode.AvalonEdit.dll (100%) rename {bin => Libraries}/ICSharpCode.NRefactory.dll (100%) rename {bin => Libraries}/ICSharpCode.SharpZipLib.dll (100%) rename {bin => Libraries}/ICSharpCode.TextEditor.dll (100%) rename {bin => Libraries}/Microsoft.Dynamic.dll (100%) rename {bin => Libraries}/Microsoft.Scripting.dll (100%) rename {bin => Libraries}/Mono.Cecil.dll (100%) rename {bin => Libraries}/Mono.Debugger.Soft.dll (100%) rename {bin => Libraries}/Mono.Debugging.Soft.dll (100%) rename {bin => Libraries}/Mono.Debugging.dll (100%) rename {bin => Libraries}/PascalABCAspects.dll (100%) rename {bin => Libraries}/SharpDisasm.dll (100%) rename {bin => Libraries}/ShiftReduceParser.dll (100%) rename {bin => Libraries}/WeifenLuo.WinFormsUI.Docking.dll (100%) diff --git a/Compiler/Compiler.csproj b/Compiler/Compiler.csproj index 3796bd0e0..ded532985 100644 --- a/Compiler/Compiler.csproj +++ b/Compiler/Compiler.csproj @@ -96,7 +96,7 @@ - ..\bin\ICSharpCode.NRefactory.dll + ..\Libraries\ICSharpCode.NRefactory.dll False @@ -105,7 +105,7 @@ False - ..\bin\Microsoft.Scripting.dll + ..\Libraries\Microsoft.Scripting.dll System diff --git a/bin/AvalonDock.dll b/Libraries/AvalonDock.dll similarity index 100% rename from bin/AvalonDock.dll rename to Libraries/AvalonDock.dll diff --git a/bin/Debugger.Core.dll b/Libraries/Debugger.Core.dll similarity index 100% rename from bin/Debugger.Core.dll rename to Libraries/Debugger.Core.dll diff --git a/bin/ICSharpCode.AvalonEdit.dll b/Libraries/ICSharpCode.AvalonEdit.dll similarity index 100% rename from bin/ICSharpCode.AvalonEdit.dll rename to Libraries/ICSharpCode.AvalonEdit.dll diff --git a/bin/ICSharpCode.NRefactory.dll b/Libraries/ICSharpCode.NRefactory.dll similarity index 100% rename from bin/ICSharpCode.NRefactory.dll rename to Libraries/ICSharpCode.NRefactory.dll diff --git a/bin/ICSharpCode.SharpZipLib.dll b/Libraries/ICSharpCode.SharpZipLib.dll similarity index 100% rename from bin/ICSharpCode.SharpZipLib.dll rename to Libraries/ICSharpCode.SharpZipLib.dll diff --git a/bin/ICSharpCode.TextEditor.dll b/Libraries/ICSharpCode.TextEditor.dll similarity index 100% rename from bin/ICSharpCode.TextEditor.dll rename to Libraries/ICSharpCode.TextEditor.dll diff --git a/bin/Microsoft.Dynamic.dll b/Libraries/Microsoft.Dynamic.dll similarity index 100% rename from bin/Microsoft.Dynamic.dll rename to Libraries/Microsoft.Dynamic.dll diff --git a/bin/Microsoft.Scripting.dll b/Libraries/Microsoft.Scripting.dll similarity index 100% rename from bin/Microsoft.Scripting.dll rename to Libraries/Microsoft.Scripting.dll diff --git a/bin/Mono.Cecil.dll b/Libraries/Mono.Cecil.dll similarity index 100% rename from bin/Mono.Cecil.dll rename to Libraries/Mono.Cecil.dll diff --git a/bin/Mono.Debugger.Soft.dll b/Libraries/Mono.Debugger.Soft.dll similarity index 100% rename from bin/Mono.Debugger.Soft.dll rename to Libraries/Mono.Debugger.Soft.dll diff --git a/bin/Mono.Debugging.Soft.dll b/Libraries/Mono.Debugging.Soft.dll similarity index 100% rename from bin/Mono.Debugging.Soft.dll rename to Libraries/Mono.Debugging.Soft.dll diff --git a/bin/Mono.Debugging.dll b/Libraries/Mono.Debugging.dll similarity index 100% rename from bin/Mono.Debugging.dll rename to Libraries/Mono.Debugging.dll diff --git a/bin/PascalABCAspects.dll b/Libraries/PascalABCAspects.dll similarity index 100% rename from bin/PascalABCAspects.dll rename to Libraries/PascalABCAspects.dll diff --git a/bin/SharpDisasm.dll b/Libraries/SharpDisasm.dll similarity index 100% rename from bin/SharpDisasm.dll rename to Libraries/SharpDisasm.dll diff --git a/bin/ShiftReduceParser.dll b/Libraries/ShiftReduceParser.dll similarity index 100% rename from bin/ShiftReduceParser.dll rename to Libraries/ShiftReduceParser.dll diff --git a/bin/WeifenLuo.WinFormsUI.Docking.dll b/Libraries/WeifenLuo.WinFormsUI.Docking.dll similarity index 100% rename from bin/WeifenLuo.WinFormsUI.Docking.dll rename to Libraries/WeifenLuo.WinFormsUI.Docking.dll diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 48027b085640108d9e32d7c772a9f1adb349c7d7..af11206426cfe1556f4f1ab62fde15dd27515051 100644 GIT binary patch delta 76 zcmV-S0JHzK_yq6x1d!kXi?QLcgE&r4Ur;E9{M~jgr&C!2`(Z4 delta 23 fcmaF=gJtUvmI)6S12;b0*gSb6yUgYnE$!O@ol^|S diff --git a/Parsers/VBNETParser/VBNETParser.csproj b/Parsers/VBNETParser/VBNETParser.csproj index f63453abc..8ea9c23b2 100644 --- a/Parsers/VBNETParser/VBNETParser.csproj +++ b/Parsers/VBNETParser/VBNETParser.csproj @@ -66,7 +66,7 @@ - ..\..\bin\ICSharpCode.NRefactory.dll + ..\..\Libraries\ICSharpCode.NRefactory.dll False diff --git a/PluginsSupport/PluginsSupport.csproj b/PluginsSupport/PluginsSupport.csproj index 66ab872e1..36c1db15c 100644 --- a/PluginsSupport/PluginsSupport.csproj +++ b/PluginsSupport/PluginsSupport.csproj @@ -53,7 +53,9 @@ AllRules.ruleset - + + ..\Libraries\ICSharpCode.TextEditor.dll + diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index f78522f0d..1639aaaf4 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.2.0.1509' +!define VERSION '3.2.0.1511' diff --git a/VisualPascalABCNET/VisualPascalABCNET.csproj b/VisualPascalABCNET/VisualPascalABCNET.csproj index 28abcb4c4..4eca7233a 100644 --- a/VisualPascalABCNET/VisualPascalABCNET.csproj +++ b/VisualPascalABCNET/VisualPascalABCNET.csproj @@ -74,9 +74,8 @@ 4096 - - False - ..\bin\Debugger.Core.dll + + ..\Libraries\Debugger.Core.dll False @@ -86,18 +85,16 @@ False FormsDesignerBinding\Libs\ICSharpCode.SharpDevelop.Widgets.dll - - False - ..\bin\ICSharpCode.TextEditor.dll + + ..\Libraries\ICSharpCode.TextEditor.dll - - False - ..\bin\SharpDisasm.dll + + ..\Libraries\SharpDisasm.dll @@ -110,9 +107,8 @@ - - False - ..\bin\WeifenLuo.WinFormsUI.Docking.dll + + ..\Libraries\WeifenLuo.WinFormsUI.Docking.dll @@ -845,7 +841,9 @@ true - + + +