From e5bc45a6e20890092c2509fa1f56fb404c9ad87a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 30 Apr 2006 16:56:35 +0000 Subject: [PATCH] Fixed base addresses and used [DependencyAttribute] to prevent assemblies from being relocated. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1377 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- doc/AssemblyBaseAddresses.txt | 61 +++++++++++++++++++ .../Boo/BooBinding/Project/BooBinding.csproj | 2 +- .../Project/NRefactoryToBooConverter.csproj | 12 ++++ .../Project/CSharpBinding.csproj | 10 ++- .../ILAsmBinding/Project/ILAsmBinding.csproj | 11 +++- .../VBNetBinding/Project/VBNetBinding.csproj | 11 +++- .../Project/FormsDesigner.csproj | 2 +- .../Project/ResourceEditor.csproj | 11 +++- .../XmlEditor/Project/XmlEditor.csproj | 2 +- .../AddInManager/Project/AddInManager.csproj | 2 +- .../Misc/AddinScout/Project/AddinScout.csproj | 11 +++- .../CodeCoverage/Project/CodeCoverage.csproj | 2 +- .../Project/Debugger.AddIn.csproj | 11 +++- .../Project/Debugger.Core.csproj | 5 +- .../TreeListView/Project/TreeListView.csproj | 10 ++- .../Project/FiletypeRegisterer.csproj | 11 +++- .../Project/HighlightingEditor.csproj | 10 ++- .../HtmlHelp2JScriptGlobals.vbproj | 12 +++- .../Misc/HtmlHelp2/Project/HtmlHelp2.csproj | 13 ++++ .../Misc/MonoAddIn/Project/MonoAddIn.csproj | 2 +- .../Project/MonoReflectionLoader.csproj | 2 +- .../Misc/NAntAddIn/Project/NAntAddIn.csproj | 5 +- .../PInvokeAddIn/Project/PInvokeAddIn.csproj | 10 ++- .../Misc/RegExpTk/Project/RegExpTk.csproj | 10 ++- src/AddIns/Misc/SharpQuery/SharpQuery.csproj | 2 +- .../SharpReport/SharpReport.csproj | 2 +- .../SharpReportAddin/SharpReportAddin.csproj | 2 +- .../SharpReportCore/SharpReportCore.csproj | 2 +- .../SharpReportWizard/ReportGenerator.csproj | 2 +- .../Misc/StartPage/Project/StartPage.csproj | 10 ++- .../Misc/UnitTesting/UnitTesting.csproj | 2 +- .../WinFormsUI/WinFormsUI.csproj | 14 ++++- .../Project/ICSharpCode.Build.Tasks.csproj | 2 +- .../Project/ICSharpCode.TextEditor.csproj | 4 +- .../NRefactory/Project/NRefactory.csproj | 2 +- .../Project/Configuration/AssemblyInfo.cs | 9 +++ .../Project/ICSharpCode.SharpDevelop.csproj | 2 +- .../Project/Configuration/AssemblyInfo.cs | 3 + src/Main/StartUp/Project/StartUp.csproj | 2 +- 39 files changed, 252 insertions(+), 46 deletions(-) create mode 100644 doc/AssemblyBaseAddresses.txt diff --git a/doc/AssemblyBaseAddresses.txt b/doc/AssemblyBaseAddresses.txt new file mode 100644 index 0000000000..8e96fe48fe --- /dev/null +++ b/doc/AssemblyBaseAddresses.txt @@ -0,0 +1,61 @@ +To be on the safe side and leave enough space for the future, +the in-memory size of an assembly used here should be 8 times the disk image size. + +Sysinternals Processexplorer can show relocated assemblies in yellow in the DLL View. + +adr = 0x5000000 +def AddModule(kbsize as int): + print "0x${adr.ToString('x')} - 0x${(adr + 3 * kbsize * 1024).ToString('x')}" + adr += 8 * kbsize * 1024 + adr = 0x80000 * System.Math.Ceiling(cast(double,adr) / 0x80000) + +def AddModules(*names as (string)): + for name in names: + System.Console.Write("${name}:\t") + AddModule(System.IO.FileInfo("d:\\corsavy\\sharpdevelop\\bin\\" + name + ".dll").Length / 1024) + +AssemblyName: startaddress - endaddress +ICSharpCode.Core: 0x5000000 - 0x504e000 +ICSharpCode.SharpDevelop: 0x5100000 - 0x5472000 +ICSharpCode.NRefactory: 0x5a80000 - 0x5b9a000 +ICSharpCode.TextEditor: 0x5d80000 - 0x5e67000 +MonoReflectionLoader: 0x6000000 - 0x600c000 +WeifenLuo.WinFormsUI.Docking: 0x6080000 - 0x6107000 +ICSharpCode.Build.Tasks: 0x6200000 - 0x621b000 + +CSharpBinding: 0x6280000 - 0x62bc000 +ILAsmBinding: 0x6380000 - 0x639b000 +VBNetBinding: 0x6400000 - 0x643f000 +NRefactoryToBooConverter: 0x6500000 - 0x6536000 +BooBinding: 0x6600000 - 0x664e000 + +FormsDesigner: 0x6700000 - 0x676f000 +ResourceEditor: 0x6880000 - 0x689e000 +XmlEditor: 0x6900000 - 0x6948000 + +ICSharpCode.AddInMananger: 0x6a00000 - 0x6a24000 +AddInScout: 0x6a80000 - 0x6a8b400 +CodeCoverage: 0x6b00000 - 0x6b30000 +TreeListView (debugger): 0x6b80000 - 0x6be6000 +Debugger.Code: 0x6d00000 - 0x6ddb000 +Debugger.AddIn: 0x6f80000 - 0x6faa000 +FileTypeRegisterer: 0x7000000 - 0x7009000 +HighlightingEditor: 0x7080000 - 0x70ec000 +HtmlHelp2: 0x7200000 - 0x723f000 +HtmlHelp2JScriptGlobals: 0x7300000 - 0x7306c00 +MonoAddIn: 0x7380000 - 0x7395000 +NAntAddIn: 0x7400000 - 0x7427000 +PInvokeAddIn: 0x7480000 - 0x749b000 +RegExpTk: 0x7500000 - 0x7524000 +SharpQuery: 0x7580000 - 0x75b0000 +SharpReportCore: 0x7600000 - 0x7654000 +SharpReport: 0x7700000 - 0x773c000 +SharpReportAddIn: 0x7800000 - 0x781e000 +ReportGenerator: 0x7880000 - 0x78a1000 +StartPage: 0x7900000 - 0x791e000 +UnitTesting: 0x7980000 - 0x799b000 + +Next free address: 0x7a00000 + + + diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj index c02726d9cd..e35be6c90f 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 106954752 AnyCPU 4096 4 diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj index 505a800b5a..4233cf143d 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj @@ -6,6 +6,18 @@ Debug AnyCPU {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} + False + False + False + None + False + Auto + 105906176 + AnyCPU + 4096 + 4 + false + false bin\Debug\ diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index c2da85821c..0e912d36b8 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -12,9 +12,17 @@ OnSuccessfulBuild Library File + False + False + Auto + 103284736 + AnyCPU + 4096 + 4 + false - True + true Full False True diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj index 5b2d2cd719..9c5dfab648 100644 --- a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj +++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj @@ -13,13 +13,20 @@ False OnSuccessfulBuild Library + False + False + Auto + 104333312 + AnyCPU + 4096 + false - True + true False True ..\..\..\..\..\AddIns\AddIns\BackendBindings\ILAsmBinding\ - full + Full False diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj index b2cd248be5..e4d3a51bb1 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj @@ -13,13 +13,20 @@ OnSuccessfulBuild Library File + False + False + Auto + 104857600 + AnyCPU + 4096 - True + true False True ..\..\..\..\..\AddIns\AddIns\BackendBindings\VBNetBinding\ - False + false + Full False diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj index e40a91a61a..3c44141c30 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj @@ -21,7 +21,7 @@ False ..\..\..\..\..\AddIns\AddIns\DisplayBindings\FormsDesigner\ true - 4194304 + 108003328 4096 diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj index 58ef5c8f53..aea2f0b23e 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj @@ -12,13 +12,22 @@ Library File ResourceEditor + False + False + Auto + 109576192 + AnyCPU + 4096 + 4 + false - True + true False True ..\..\..\..\..\AddIns\AddIns\DisplayBindings\ResourceEditor\ DEBUG + Full False diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj index 9cd81ef6f1..218f15c9c0 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj @@ -16,7 +16,7 @@ ..\..\..\..\..\bin\SharpDevelop.exe False Auto - 4194304 + 110100480 AnyCPU 4096 0618 diff --git a/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj b/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj index dfceeebb12..be9907234e 100644 --- a/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj +++ b/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 111149056 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj index 125ddd9763..e5cf99436a 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj @@ -13,12 +13,21 @@ False OnSuccessfulBuild Library + False + False + False + Auto + 111673344 + AnyCPU + 4096 + false - True + true False DEBUG ..\..\..\..\..\AddIns\AddIns\Misc\AddinScout\ + Full False diff --git a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.csproj b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.csproj index f28a6a4804..8ce4a21bf1 100644 --- a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.csproj +++ b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 112197632 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj index f4dc63cdcf..5844a3e9be 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj @@ -9,10 +9,19 @@ Debugger.AddIn Debugger.AddIn 4 + False + False + False + False + Auto + 116916224 + AnyCPU + 4096 + false true - full + Full false ..\..\..\..\..\..\AddIns\AddIns\Misc\Debugger\ DEBUG;TRACE diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj index 40c641edd2..4386a2dab9 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj @@ -13,7 +13,7 @@ False False Auto - 4194304 + 114294784 AnyCPU 4096 4 @@ -21,11 +21,12 @@ true - full + Full 108 ..\..\..\..\..\..\AddIns\AddIns\Misc\Debugger\ DEBUG;TRACE True + False PdbOnly diff --git a/src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj b/src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj index ca573e9888..dd05ded1b2 100644 --- a/src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj +++ b/src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj @@ -9,10 +9,18 @@ TreeListView TreeListView 4 + False + False + False + Auto + 112721920 + AnyCPU + 4096 + false true - full + Full false ..\..\..\..\..\..\AddIns\AddIns\Misc\Debugger\ DEBUG;TRACE diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj index 12bf1b5c67..ab6832f5e3 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj @@ -13,12 +13,21 @@ OnSuccessfulBuild Library ICSharpCode.FiletypeRegisterer + False + False + False + Auto + 117440512 + AnyCPU + 4096 + false - True + true False ..\..\..\..\..\AddIns\AddIns\Misc\FiletypeRegisterer\ DEBUG + Full False diff --git a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj index bea20cdbd9..b558189e01 100644 --- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj +++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj @@ -12,15 +12,21 @@ False OnSuccessfulBuild Library + False + Auto + 117964800 + AnyCPU + 4096 - True + true False False True ..\..\..\..\..\AddIns\AddIns\Misc\HighlightingEditor\ - False + false DEBUG + Full False diff --git a/src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj b/src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj index 98b49f8519..8ceb27523b 100644 --- a/src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj +++ b/src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj @@ -7,12 +7,22 @@ AnyCPU Windows {E54A5AD2-418D-4A85-BA5E-CD803DE38715} + False + On + Off + Binary + False + Auto + 120586240 + AnyCPU + 4 + false bin\Debug\ False DEBUG,TRACE - True + true Full diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj index 146b159c02..c0c6492583 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj @@ -9,10 +9,23 @@ 8.0.50215 2.0 Resources\dynamichelp.res + False + False + False + None + False + Auto + 119537664 + AnyCPU + 4096 + 4 + false + false ..\..\..\..\..\AddIns\AddIns\Misc\HtmlHelp2\ DEBUG;TRACE + False ..\..\..\..\..\AddIns\AddIns\Misc\HtmlHelp2\ diff --git a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj b/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj index 82165fc163..9f6e163376 100644 --- a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj +++ b/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 121110528 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/MonoReflectionLoader/Project/MonoReflectionLoader.csproj b/src/AddIns/Misc/MonoReflectionLoader/Project/MonoReflectionLoader.csproj index f79c63b86b..c5b0102e8d 100644 --- a/src/AddIns/Misc/MonoReflectionLoader/Project/MonoReflectionLoader.csproj +++ b/src/AddIns/Misc/MonoReflectionLoader/Project/MonoReflectionLoader.csproj @@ -10,7 +10,7 @@ False False Auto - 92274688 + 100663296 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/NAntAddIn/Project/NAntAddIn.csproj b/src/AddIns/Misc/NAntAddIn/Project/NAntAddIn.csproj index 60b1b61512..9b4f6577f4 100644 --- a/src/AddIns/Misc/NAntAddIn/Project/NAntAddIn.csproj +++ b/src/AddIns/Misc/NAntAddIn/Project/NAntAddIn.csproj @@ -13,12 +13,12 @@ Full False Auto - 4194304 + 121634816 AnyCPU 4096 + true - true False False True @@ -26,7 +26,6 @@ false - False True False False diff --git a/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj b/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj index c20c9fb1c4..cae34383d9 100644 --- a/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj +++ b/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj @@ -10,14 +10,20 @@ 4 False False + False + Auto + 122159104 + AnyCPU + 4096 - True + true False False True ..\..\..\..\..\AddIns\AddIns\Misc\PInvokeAddIn\ - False + false + Full False diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj index e646f94319..7e979ccd7b 100644 --- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj +++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj @@ -12,15 +12,21 @@ False OnSuccessfulBuild Library + False + Auto + 122683392 + AnyCPU + 4096 - True + true False False True ..\..\..\..\..\AddIns\AddIns\Misc\RegExpTk\ - False + false DEBUG + Full False diff --git a/src/AddIns/Misc/SharpQuery/SharpQuery.csproj b/src/AddIns/Misc/SharpQuery/SharpQuery.csproj index c04200ed61..4b1e5934d1 100644 --- a/src/AddIns/Misc/SharpQuery/SharpQuery.csproj +++ b/src/AddIns/Misc/SharpQuery/SharpQuery.csproj @@ -13,7 +13,7 @@ OnSuccessfulBuild False Auto - 4194304 + 123207680 AnyCPU 4096 Program diff --git a/src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj b/src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj index 03c4d31708..4f549a1b45 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj +++ b/src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 124780544 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj index 74cf0b72e6..6aa25059fb 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj +++ b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 125829120 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj index a4f13916e9..5cccbf2369 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 123731968 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.csproj b/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.csproj index 8a3d1cc2b7..476fc8d0ba 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.csproj +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.csproj @@ -10,7 +10,7 @@ False False Auto - 4194304 + 126353408 AnyCPU 4096 4 diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj index 6cfb69295e..fac5010148 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj @@ -13,15 +13,21 @@ OnSuccessfulBuild Library ICSharpCode.StartPage + False + Auto + 126877696 + AnyCPU + 4096 - True + true False False True ..\..\..\..\..\AddIns\AddIns\Misc\StartPage\ - True + true DEBUG + Full False diff --git a/src/AddIns/Misc/UnitTesting/UnitTesting.csproj b/src/AddIns/Misc/UnitTesting/UnitTesting.csproj index 1e64c4a4b6..27558dae90 100644 --- a/src/AddIns/Misc/UnitTesting/UnitTesting.csproj +++ b/src/AddIns/Misc/UnitTesting/UnitTesting.csproj @@ -11,7 +11,7 @@ False False Auto - 4194304 + 127401984 AnyCPU 4096 4 diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj index 456ee55db8..82855efb13 100644 --- a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj +++ b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj @@ -16,10 +16,12 @@ WeifenLuo.WinFormsUI OnBuildSuccess true + Auto + AnyCPU bin\Debug\ - 285212672 + 101187584 false DEBUG;TRACE true @@ -28,11 +30,16 @@ false 4 -Microsoft.Design#CA1012;-Microsoft.Design#CA2210;-Microsoft.Design#CA1040;-Microsoft.Design#CA1005;-Microsoft.Design#CA1020;-Microsoft.Design#CA1021;-Microsoft.Design#CA1010;-Microsoft.Design#CA1011;-Microsoft.Design#CA1009;-Microsoft.Design#CA1050;-Microsoft.Design#CA1026;-Microsoft.Design#CA1019;-Microsoft.Design#CA1031;-Microsoft.Design#CA1047;-Microsoft.Design#CA1000;-Microsoft.Design#CA1048;-Microsoft.Design#CA1051;-Microsoft.Design#CA1002;-Microsoft.Design#CA1061;-Microsoft.Design#CA1006;-Microsoft.Design#CA1046;-Microsoft.Design#CA1045;-Microsoft.Design#CA1038;-Microsoft.Design#CA1008;-Microsoft.Design#CA1028;-Microsoft.Design#CA1004;-Microsoft.Design#CA1035;-Microsoft.Design#CA1063;-Microsoft.Design#CA1032;-Microsoft.Design#CA1023;-Microsoft.Design#CA1033;-Microsoft.Design#CA1039;-Microsoft.Design#CA1016;-Microsoft.Design#CA1014;-Microsoft.Design#CA1017;-Microsoft.Design#CA1018;-Microsoft.Design#CA1027;-Microsoft.Design#CA1059;-Microsoft.Design#CA1060;-Microsoft.Design#CA1034;-Microsoft.Design#CA1013;-Microsoft.Design#CA1036;-Microsoft.Design#CA1044;-Microsoft.Design#CA1041;-Microsoft.Design#CA1025;-Microsoft.Design#CA1052;-Microsoft.Design#CA1053;-Microsoft.Design#CA1057;-Microsoft.Design#CA1058;-Microsoft.Design#CA1001;-Microsoft.Design#CA1049;-Microsoft.Design#CA1054;-Microsoft.Design#CA1056;-Microsoft.Design#CA1055;-Microsoft.Design#CA1030;-Microsoft.Design#CA1003;-Microsoft.Design#CA1007;-Microsoft.Design#CA1043;-Microsoft.Design#CA1024;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Maintainability#CA1502;-Microsoft.Maintainability#CA1501;-Microsoft.Maintainability#CA1500;-Microsoft.Naming#CA1718;-Microsoft.Naming#CA1720;-Microsoft.Naming#CA1700;-Microsoft.Naming#CA1712;-Microsoft.Naming#CA1713;-Microsoft.Naming#CA1709;-Microsoft.Naming#CA1708;-Microsoft.Naming#CA1715;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1707;-Microsoft.Naming#CA1722;-Microsoft.Naming#CA1711;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1705;-Microsoft.Naming#CA1725;-Microsoft.Naming#CA1719;-Microsoft.Naming#CA1721;-Microsoft.Naming#CA1706;-Microsoft.Naming#CA1724;-Microsoft.Naming#CA1726;-Microsoft.Performance#CA1809;-Microsoft.Performance#CA1811;-Microsoft.Performance#CA1812;-Microsoft.Performance#CA1807;-Microsoft.Performance#CA1813;-Microsoft.Performance#CA1823;-Microsoft.Performance#CA1816;-Microsoft.Performance#CA1817;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1818;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1814;-Microsoft.Performance#CA1819;-Microsoft.Performance#CA1804;-Microsoft.Performance#CA1820;-Microsoft.Performance#CA1802;-Microsoft.Security#CA2116;-Microsoft.Security#CA2117;-Microsoft.Security#CA2105;-Microsoft.Security#CA2115;-Microsoft.Security#CA2104;-Microsoft.Security#CA2122;-Microsoft.Security#CA2114;-Microsoft.Security#CA2123;-Microsoft.Security#CA2111;-Microsoft.Security#CA2108;-Microsoft.Security#CA2107;-Microsoft.Security#CA2103;-Microsoft.Security#CA2100;-Microsoft.Security#CA2118;-Microsoft.Security#CA2109;-Microsoft.Security#CA2119;-Microsoft.Security#CA2106;-Microsoft.Security#CA2112;-Microsoft.Security#CA2110;-Microsoft.Security#CA2120;-Microsoft.Security#CA2101;-Microsoft.Security#CA2121;-Microsoft.Security#CA2126;-Microsoft.Security#CA2124;-Microsoft.Usage#CA2209;-Microsoft.Usage#CA2236;-Microsoft.Usage#CA2227;-Microsoft.Usage#CA2213;-Microsoft.Usage#CA2216;-Microsoft.Usage#CA2215;-Microsoft.Usage#CA2214;-Microsoft.Usage#CA2222;-Microsoft.Usage#CA2202;-Microsoft.Usage#CA1806;-Microsoft.Usage#CA2217;-Microsoft.Usage#CA2212;-Microsoft.Usage#CA2219;-Microsoft.Usage#CA2201;-Microsoft.Usage#CA2228;-Microsoft.Usage#CA2221;-Microsoft.Usage#CA2220;-Microsoft.Usage#CA2240;-Microsoft.Usage#CA2229;-Microsoft.Usage#CA2238;-Microsoft.Usage#CA2207;-Microsoft.Usage#CA2208;-Microsoft.Usage#CA2235;-Microsoft.Usage#CA2237;-Microsoft.Usage#CA2232;-Microsoft.Usage#CA2223;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2233;-Microsoft.Usage#CA2225;-Microsoft.Usage#CA2226;-Microsoft.Usage#CA2231;-Microsoft.Usage#CA2224;-Microsoft.Usage#CA2218;-Microsoft.Usage#CA2234;-Microsoft.Usage#CA2241;-Microsoft.Usage#CA2239;-Microsoft.Usage#CA2200;-Microsoft.Usage#CA1801;-Microsoft.Usage#CA2205;-Microsoft.Usage#CA2230 + Full + False + False + False + false bin\Release\ false - 285212672 + 101187584 false TRACE false @@ -43,6 +50,7 @@ false false 4 + None @@ -252,4 +260,4 @@ - + \ No newline at end of file diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj index 4d2d97be9b..2337c3911c 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj @@ -12,7 +12,7 @@ None False Auto - 92405760 + 102760448 AnyCPU 4096 4 diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj index a84f0da338..0fefcfec47 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj +++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj @@ -17,7 +17,7 @@ ICSharpCode.TextEditor False Auto - 90177536 + 98041856 AnyCPU 4096 @@ -200,4 +200,4 @@ - + \ No newline at end of file diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index e733bc61a9..e7b876f06c 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -18,7 +18,7 @@ False False Auto - 88080384 + 94896128 AnyCPU 4096 diff --git a/src/Main/Base/Project/Configuration/AssemblyInfo.cs b/src/Main/Base/Project/Configuration/AssemblyInfo.cs index dc11f3140b..39fcb58b2f 100644 --- a/src/Main/Base/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Base/Project/Configuration/AssemblyInfo.cs @@ -13,6 +13,15 @@ using System.Runtime.CompilerServices; [assembly: CLSCompliant(false)] [assembly: StringFreezing()] +// Use hard-binding for ICSharpCode.SharpDevelop: +[assembly: Dependency("ICSharpCode.Core", LoadHint.Always)] +[assembly: Dependency("ICSharpCode.TextEditor", LoadHint.Always)] +[assembly: Dependency("ICSharpCode.NRefactory", LoadHint.Always)] +[assembly: Dependency("System.Drawing", LoadHint.Always)] +[assembly: Dependency("System.Xml", LoadHint.Always)] +[assembly: Dependency("System.Windows.Forms", LoadHint.Always)] +[assembly: Dependency("WeifenLuo.WinFormsUI.Docking", LoadHint.Always)] + [assembly: AssemblyTitle("SharpDevelopBase")] [assembly: AssemblyDescription("The base add-in of SharpDevelop")] [assembly: AssemblyConfiguration("")] diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index aeeeeafdcc..6969ebc577 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -16,7 +16,7 @@ False False Auto - 84410368 + 84934656 AnyCPU 4096 false diff --git a/src/Main/Core/Project/Configuration/AssemblyInfo.cs b/src/Main/Core/Project/Configuration/AssemblyInfo.cs index ac28a4b6cb..bc97665c4a 100644 --- a/src/Main/Core/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Core/Project/Configuration/AssemblyInfo.cs @@ -12,6 +12,9 @@ using System.Runtime.CompilerServices; [assembly: CLSCompliant(true)] [assembly: StringFreezing()] +// Use hard-binding for ICSharpCode.Core: +[assembly: Dependency("log4net", LoadHint.Always)] + [assembly: AssemblyTitle("ICSharpCode.Core")] [assembly: AssemblyDescription("The ICSharpCode Core containing the AddInTree and service Subsystem")] [assembly: AssemblyConfiguration("")] diff --git a/src/Main/StartUp/Project/StartUp.csproj b/src/Main/StartUp/Project/StartUp.csproj index c2d9c33a09..5d65cf8473 100644 --- a/src/Main/StartUp/Project/StartUp.csproj +++ b/src/Main/StartUp/Project/StartUp.csproj @@ -13,7 +13,7 @@ Resources\StartUp.snk .\Resources\SharpDevelop.ico ..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe StartupOnly - 92798976 + 4194304 False False Auto