Added latest version of server tools in the right place, and removed sharp server tools from the solution. Not deleted sharp server tools yet since I need some code from it

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2941 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
18 years ago · c6ae904f0c
24 changed files with 1599 additions and 153 deletions
--- a/doc/ChangeLog.xml
+++ b/doc/ChangeLog.xml
@ -1,4 +1,342 @@
 <ChangeLog project="SharpDevelop">
  <Change author="Daniel Grunwald" date="02/07/2008">Fixed forum-7331: Deleting .cs code template group causes code completion to throw NullReferenceException</Change>
  <Change author="Matt Ward" date="02/06/2008">${ProjectDir} string now returns the active project's directory and not its filename.</Change>
  <Change author="Matt Ward" date="02/03/2008">Added support for casts and class method calls in the python code converter.</Change>
  <Change author="Matt Ward" date="02/02/2008">ClassBrowserPad checks that the parent nodes in the tree are AbstractProjectNodes before updating their parse information. This fixes a null reference exception that was being thrown if the class browser was showing classes instead of projects.</Change>
  <Change author="Daniel Grunwald" date="01/29/2008">Fixed forum-7302: InvalidOperationException for code completion after new keyword.
 DynamicHelpPad: invoke UpdateTick on main thread to avoid race condition.</Change>
  <Change author="Daniel Grunwald" date="01/28/2008">Fixed build.</Change>
  <Change author="Daniel Grunwald" date="01/28/2008">Don't reuse IAmbience instances (they are not thread-safe).
 Make NewFileDialog + SelectReferenceDialog resizable.
 ClassBrowser: fixed bug that could cause classes not to be removed from the class browser when the file containing the class definition was removed from the project.
 ClassBrowser: fixed bug with generic and non-generic classes that have the same name.</Change>
  <Change author="Daniel Grunwald" date="01/28/2008">Forum-6859: Show code templates in code completion.
 Templates are now inserted by pressing Tab (instead of Space).
 However, when "Automatic template insertion" in the text editor options is on (new default: off), templates are also inserted when a template is chosen from the code completion list.</Change>
  <Change author="Daniel Grunwald" date="01/27/2008">Fixed forum-7200, forum-7286: Exception when trying to remove lines with breakpoints
 Improved default selection in "Go to" dialog.
 SharpDevelop.Dom: Renamed IDecoration-&gt;IEntity, moved common properties in IClass and IMember into IEntity.</Change>
  <Change author="David Srbecký" date="01/26/2008">Fixed IList for types that do not implement IList, but their superclass does.</Change>
  <Change author="Daniel Grunwald" date="01/26/2008">Make IClass (+ IMember, IParameter, IAttribute, ICompilationUnit .....) immutable.
 Rewrite partial class support in DefaultProjectContent.</Change>
  <Change author="David Srbecký" date="01/26/2008">If object supports IList, use it to access the items from local variables pad.</Change>
  <Change author="David Srbecký" date="01/26/2008">When Terminate is called immediately mark the process as Expired.  
 After that ignore all callbacks except ExitProcess.  
 Remove the process when ExitProcess is received.  
 If it was last process reset debugger.</Change>
  <Change author="David Srbecký" date="01/26/2008">API support for enumerating implemented interfaces</Change>
  <Change author="David Srbecký" date="01/26/2008">Removed some code duplication the metadata wrapper.</Change>
  <Change author="David Srbecký" date="01/26/2008">Bugfix for Termination from the exception dialog.</Change>
  <Change author="David Srbecký" date="01/26/2008">Fixed NullRerferenceExcpetion in SimpleMemberReference evaluator.  If member not found, throw exception.</Change>
  <Change author="David Srbecký" date="01/26/2008">Updated string resources</Change>
  <Change author="David Srbecký" date="01/26/2008">Terminate command does 'Break+Terminate' rather then 'Continue+Break+Terminate'.  I think this was left over from .NET 1.1 hack.  
 Changed the way callbacks are handled - it uses pauseOnNextExit flag now rather then two different exit procedures.  
 Queued callback are drained from the process queue.</Change>
  <Change author="David Srbecký" date="01/25/2008">Starting support for multiple AppDomains.</Change>
  <Change author="David Srbecký" date="01/25/2008">Fixed base type for arrays and for primitive values.  Updated tests for it.</Change>
  <Change author="David Srbecký" date="01/25/2008">Base class tests</Change>
  <Change author="David Srbecký" date="01/23/2008">Compare object types by module paths rather then modules instances - one module can be loaded multiple times (for appdomains)</Change>
  <Change author="David Srbecký" date="01/23/2008">Correct order of events when process is killed.  
 Only ValueNode.Create can be used to create node.</Change>
  <Change author="David Srbecký" date="01/23/2008">Change "Private members" to "Non-Public members"</Change>
  <Change author="David Srbecký" date="01/23/2008">Do not allow exploring of locals while debuggee is running</Change>
  <Change author="Christoph Wille" date="01/23/2008">Updated setup for SHFB 1.6.0.4</Change>
  <Change author="Christoph Wille" date="01/23/2008">Copy new BuildComponents folder for SHFB 1.6.0.4</Change>
  <Change author="Christoph Wille" date="01/23/2008">SHFB 1.6.0.4</Change>
  <Change author="Christoph Wille" date="01/23/2008">Remove old version of SHFB</Change>
  <Change author="David Srbecký" date="01/21/2008">The 'System.Object' type does not have any children - do not show 'plus' for it</Change>
  <Change author="David Srbecký" date="01/21/2008">Limit repainting of Local Variables Pad to 40 ms.</Change>
  <Change author="David Srbecký" date="01/21/2008">ThreadsPad refresh does Application.DoEvents() as well.</Change>
  <Change author="David Srbecký" date="01/21/2008">CallStackPad refresh does Application.DoEvents() as well.  
 DoEvents() called very often.  
 New class for logging time measurements to the console.  
 If one OnPause delegate resumes process, remaining delegates are not called.</Change>
  <Change author="David Srbecký" date="01/20/2008">Measure performance of CallStackPad refresh</Change>
  <Change author="David Srbecký" date="01/20/2008">Performance tweak - call Application.DoEvents() before refreshing local variables pad.</Change>
  <Change author="David Srbecký" date="01/20/2008">Abort Evals that take more the 500 ms</Change>
  <Change author="David Srbecký" date="01/20/2008">Quick property access support for optimized code.</Change>
  <Change author="David Srbecký" date="01/20/2008">Call "ToString" on objects</Change>
  <Change author="David Srbecký" date="01/20/2008">Completely rewritten the sate management for Process.</Change>
  <Change author="Daniel Grunwald" date="01/20/2008">Make ICSharpCode.SharpDevelop.BuildWorker 32-bit only - if SharpDevelop.exe is 32-bit, BuildWorker must also be 32-bit to avoid using a mixture of 32-bit and 64-bit MSBuild when compiling a solution.</Change>
  <Change author="David Srbecký" date="01/20/2008">Rewritten Exception class</Change>
  <Change author="David Srbecký" date="01/20/2008">Show the list of childs being progressively populated, do not wait until they are all loaded.</Change>
  <Change author="David Srbecký" date="01/20/2008">Rewritten evals.  They are more restricted now: 
 - Eval starts executing as soon as it is created
 - Evals can not be 'scheduled' and executed latter</Change>
  <Change author="David Srbecký" date="01/19/2008">Optimization - if a property just returns a field value, do not evaluate the property but access the field directly.</Change>
  <Change author="David Srbecký" date="01/19/2008">Move EventArgs from their own files to the files they relate to</Change>
  <Change author="David Srbecký" date="01/19/2008">Reorganized file structure
 </Change>
  <Change author="David Srbecký" date="01/19/2008">Refreshed the documentation file.  (Switched to Sandcastle)</Change>
  <Change author="David Srbecký" date="01/19/2008">Enter version to AssemblyInfo</Change>
  <Change author="David Srbecký" date="01/19/2008">Renamed MetaData class to MetaDataImport to avoid name collision with the namespace.  
 Removed Util.Lists.</Change>
  <Change author="David Srbecký" date="01/19/2008">Moved metadata related classes to Debugger.MetaData namespace</Change>
  <Change author="David Srbecký" date="01/19/2008">Added synchronous Continue and Step*.  
 Use these to simplify the test code.</Change>
  <Change author="David Srbecký" date="01/19/2008">Removed TreeListView from the setup</Change>
  <Change author="David Srbecký" date="01/19/2008">Renamed Continue to AsyncContinue.  
 Renamed Step* to AsyncStep*.</Change>
  <Change author="David Srbecký" date="01/19/2008">Updated tests</Change>
  <Change author="David Srbecký" date="01/19/2008">Remove the no longer used TreeListView control</Change>
  <Change author="David Srbecký" date="01/19/2008">Update callstack by overwriting rather then by clear+fill</Change>
  <Change author="David Srbecký" date="01/18/2008">Reorganized code in CallstackPad</Change>
  <Change author="David Srbecký" date="01/18/2008">Renamed LastStackFrame to MostRecentStackFrame</Change>
  <Change author="David Srbecký" date="01/18/2008">Show changed values in blue</Change>
  <Change author="David Srbecký" date="01/18/2008">Tests - sort serialized data alphabetically</Change>
  <Change author="Daniel Grunwald" date="01/18/2008">Fixed forum-7234: resolving of constructor calls</Change>
  <Change author="David Srbecký" date="01/18/2008">Added StackOverflow test.  
 Updated tests.  
 Fixed null reference in Tread.SelectedStackFrame.</Change>
  <Change author="David Srbecký" date="01/18/2008">Added an Expression cache</Change>
  <Change author="David Srbecký" date="01/18/2008">Fixed build</Change>
  <Change author="Daniel Grunwald" date="01/18/2008">Allow using shortcuts from the main menu when a debugger tool tip has focus.</Change>
  <Change author="David Srbecký" date="01/18/2008">GetHashCode and Equals for expressions</Change>
  <Change author="David Srbecký" date="01/18/2008">Update tooltip when debugger is stepped</Change>
  <Change author="David Srbecký" date="01/18/2008">String setting not supported</Change>
  <Change author="David Srbecký" date="01/18/2008">Enabled editing in the local variables pad.  
 Fixed incremental search for the local variables pad.</Change>
  <Change author="David Srbecký" date="01/18/2008">Only the following values can be set: argument, local variable, array element, field value</Change>
  <Change author="David Srbecký" date="01/18/2008">Getting properties for generic types.  
 Updated generic test.</Change>
  <Change author="David Srbecký" date="01/18/2008">Fixed access to static fields</Change>
  <Change author="David Srbecký" date="01/18/2008">Fix: Do not show "Private members" if it is empty. Same for others.  
 Show only get properties - no indexers and setters.</Change>
  <Change author="David Srbecký" date="01/17/2008">Forgotten to commit file</Change>
  <Change author="David Srbecký" date="01/17/2008">Moving some directories</Change>
  <Change author="David Srbecký" date="01/17/2008">Removed Value.Name property.  
 Removed ValueCollection.  
 Removed ExpressionCollection.  
 Reorganized methods in StackFrame, added some convenience methods.</Change>
  <Change author="Matt Ward" date="01/16/2008">Corrected ClassDiagram's Diagram.dll entry in installer so the Diagram.dll is now installed.</Change>
  <Change author="Dickon Field" date="01/16/2008">Added a little more code for the db control - working on the db object tree</Change>
  <Change author="Daniel Grunwald" date="01/16/2008">Fixed forum-7231: InvalidOperationException when subversion overlay icon manager tries to set overlay before project browser tree view is created.
 Add try-catch around Process.Start for starting URLs (on some systems, the browser opens but Process.Start produces an exception, e.g. forum-7017).</Change>
  <Change author="David Srbecký" date="01/16/2008">Remove IExpirable from Value.  
 Tests: catch ToString exceptions.</Change>
  <Change author="David Srbecký" date="01/16/2008">Change buttons in exception box to "Break", "Continue" and "Terminate".  "Continue" is enabled only for handled exceptions and "Break" unwinds exceptions by default.  
 "Show full error..." made localizable.</Change>
  <Change author="David Srbecký" date="01/16/2008">Tests output - use name of dumped object as the XML node name.</Change>
  <Change author="David Srbecký" date="01/16/2008">Updated Stepping test</Change>
  <Change author="David Srbecký" date="01/16/2008">Include ToString value in the test output</Change>
  <Change author="David Srbecký" date="01/16/2008">A set of properties to expand can be specified in debugger tests.  
 Some tests updated.</Change>
  <Change author="David Srbecký" date="01/16/2008">Debugger tests - do not expand properties by default.</Change>
  <Change author="David Srbecký" date="01/15/2008">".cs" part of test name</Change>
  <Change author="David Srbecký" date="01/15/2008">Added the expected output to the tests as well</Change>
  <Change author="David Srbecký" date="01/15/2008">Move testing code to the tests</Change>
  <Change author="David Srbecký" date="01/15/2008">Tweak debug test output - specify the object type as attribute rather then container node.</Change>
  <Change author="David Srbecký" date="01/15/2008">Update debugger tests.  
 Prevent infinite recursion in debugger tests.</Change>
  <Change author="David Srbecký" date="01/15/2008">Add context menu to the Local Variables Pad.  
 Add context menu to error item which shows the full exception.</Change>
  <Change author="David Srbecký" date="01/15/2008">Catch evaluation errors are display them as special error node.</Change>
  <Change author="David Srbecký" date="01/15/2008">Rename ExpressionNode to ValueNode to emphasise that the node is immutable.  The expression is now evaluated before the node's constructor.</Change>
  <Change author="David Srbecký" date="01/15/2008">Fixed array access.</Change>
  <Change author="David Srbecký" date="01/15/2008">Values store expression which can be used to re-obtain the value.  
 Values do not sore names; the name is inferred from the expression.</Change>
  <Change author="David Srbecký" date="01/15/2008">Parser and Expression nodes for very simple expressions (in form "Identifier.Member.Member").  
 Re-enabled debugger tooltips.</Change>
  <Change author="David Srbecký" date="01/15/2008">Updating DynamicTreeDebuggerRow adapter.  
 Fixed disappearing plus for TreeViewNode.</Change>
  <Change author="David Srbecký" date="01/14/2008">Bug fix:  Consider that the process may be resumed in the OnDebuggeeStateChanged event</Change>
  <Change author="David Srbecký" date="01/14/2008">Abort refresh of local variables if debuggee is running</Change>
  <Change author="David Srbecký" date="01/14/2008">MethodInfo instances are unique.  Added a test for it.</Change>
  <Change author="David Srbecký" date="01/14/2008">Cache all queries for some set of type members</Change>
  <Change author="David Srbecký" date="01/14/2008">Removed walk-arounds left over from the last tree control.</Change>
  <Change author="David Srbecký" date="01/14/2008">Removed ExpressionEvaluateException.  Use GetValueException instead.</Change>
  <Change author="David Srbecký" date="01/14/2008">Any null value is assumed to be of type System.Object.  
 Fixed getting type of values type (struct)</Change>
  <Change author="David Srbecký" date="01/14/2008">Added a test for value type (struct)</Change>
  <Change author="David Srbecký" date="01/14/2008">Extended a test for function arguments.</Change>
  <Change author="David Srbecký" date="01/14/2008">Tests and tested programs can be defined in the same file.
 Added a template for debugger tests.  
 Convenience environment variable for updating XML output.</Change>
  <Change author="David Srbecký" date="01/13/2008">Methods for running all debugger tests from one assembly - not used now</Change>
  <Change author="Daniel Grunwald" date="01/13/2008">Prevent type inference cycles (e.g. "var a = a;") from causing a StackOverflowException.</Change>
  <Change author="Daniel Grunwald" date="01/13/2008">Fixed resolving when a generic class derived from a non-generic class with the same name.
 Fixed resolving when a class had the same name as its containing namespace.</Change>
  <Change author="Daniel Grunwald" date="01/13/2008">Fixed code completion after new-expression "new SomeClass().Member".
 Fixed overload resolution to try overloads in base class if no overload in the derived class is applicable.</Change>
  <Change author="David Srbecký" date="01/13/2008">Added more error checking for objects.  Better support for getting values of static members.</Change>
  <Change author="David Srbecký" date="01/13/2008">Test fix - exception throwing order changed in last commit</Change>
  <Change author="David Srbecký" date="01/13/2008">CannotGetValueException renamed to GetValueException</Change>
  <Change author="David Srbecký" date="01/13/2008">Polishing the expressions</Change>
  <Change author="Daniel Grunwald" date="01/12/2008">Fixed DefaultProjectContent.GetClass implementation: inner classes nested in other inner classes were not found.
 NRefactoryResolver: Fixed attribute constructor lookup. Resolve attribute arguments in the context of the decorated class.</Change>
  <Change author="Daniel Grunwald" date="01/12/2008">Fixed code completion in indexer setters and explicit event implementations.
 Make overload resolution aware of "ref" and "out" parameters.</Change>
  <Change author="Matt Ward" date="01/12/2008">Temporarily disabled SharpServerTools in the installer since its files are missing after a build.</Change>
  <Change author="Daniel Grunwald" date="01/12/2008">NRefactoryResolver rewrite: remove code duplication between NRefactoryResolver and TypeVisitor. Changed handling of method groups to follow C# specification more closely.
 This fixes several bugs in overload resolution.</Change>
  <Change author="Dickon Field" date="01/11/2008">resolved runtime issue in ServerTools - now runs, not complete</Change>
  <Change author="Dickon Field" date="01/11/2008">Fixed the build of this project to copy addin file to output dir correctly - still breaks at runtime though - sorry!</Change>
  <Change author="Dickon Field" date="01/11/2008">Removed the reference to Todo.cs from proj file</Change>
  <Change author="David Srbecký" date="01/11/2008">Custom Abstract Syntax Tree for debugger expression independent of NRefactory.</Change>
  <Change author="Dickon Field" date="01/11/2008">Started new style Server control, incorporating dbtool</Change>
  <Change author="David Srbecký" date="01/11/2008">Added missing SVN keyword Revision to files</Change>
  <Change author="Daniel Grunwald" date="01/11/2008">Some minor bug fixes, changed copyright date from 2007 to 2008.</Change>
  <Change author="David Srbecký" date="01/11/2008">Do not add 'this' variable for static methods</Change>
  <Change author="David Srbecký" date="01/11/2008">Abort variable refresh if debuggee is stepped</Change>
  <Change author="Matt Ward" date="01/10/2008">NUnit.Framework.dll and NUnit.Core.dll no longer registered in GAC by the installer. This makes the installer consistent with the latest NUnit installer and fixes the problem where NUnit-Console cannot find log4net when running unit tests.</Change>
  <Change author="David Srbecký" date="01/10/2008">Forum-20456 (solodev): Only non-expired StackFrame can be selected.</Change>
  <Change author="David Srbecký" date="01/09/2008">Fixed LocalVariablesPas updating.  
 Less debug output to the console.</Change>
  <Change author="David Srbecký" date="01/09/2008">If can not get managed version of executable, just use the default.</Change>
  <Change author="David Srbecký" date="01/09/2008">Removed lifetime tracking of StackFrame.  It was quite expensive and it is not necessary for the expression-based variable model.</Change>
  <Change author="David Srbecký" date="01/09/2008">Updated ClassEditor to new TreeView</Change>
  <Change author="David Srbecký" date="01/09/2008">Updating Local Variables Pad to work with the new TreeView</Change>
  <Change author="David Srbecký" date="01/09/2008">Custom modifications of the TreeView</Change>
  <Change author="David Srbecký" date="01/09/2008">Updated to TreeViewAdv control 1.6.1.0</Change>
  <Change author="David Srbecký" date="01/09/2008">Updated test</Change>
  <Change author="Daniel Grunwald" date="01/09/2008">Fixed forum-7193: CSharpOutputVisitor bugs</Change>
  <Change author="David Srbecký" date="01/08/2008">Show 'Private members' and similar nodes only if they are not empty.  
 Changed the semantics of BindingFlags - if no demands are specified, it implicitly means 'all' rather then 'none'.</Change>
  <Change author="David Srbecký" date="01/08/2008">Small bugfix: Update the Local Variables pad when stepping</Change>
  <Change author="David Srbecký" date="01/08/2008">Removed the caches in StackFrame - Values can not be cached now since they have much shorter lifespan</Change>
  <Change author="David Srbecký" date="01/08/2008">Updated DynamicTreeDebuggerRow adapter to the new model.</Change>
  <Change author="Daniel Grunwald" date="01/08/2008">Fixed forum-7172: NullReferenceException in C# parser when "fixed" keyword was used incorrectly.</Change>
  <Change author="Daniel Grunwald" date="01/08/2008">Fixed forum-7126: Template RunCommand's only work on new solutions
 Forum-7191: When NSvn.Client initialization fails, disable project browser overlays.
 Exception handler in ParserService.ParserFile: show the name of the file that caused the exception.
 AsynchronousAdvancedHighlighter: do not try to highlight deleted lines. This should fix the bug reported in forum-7175.</Change>
  <Change author="David Srbecký" date="01/08/2008">Updated TreeViewNode adapter to the new model.  
 The pad is progressively updated using the same method as before - Application.DoEvents() is called periodically so that repaint events are invoked.  I still need to put is checks so that press of Stepping command terminates the update. </Change>
  <Change author="David Srbecký" date="01/05/2008">Completely rewritten the variable model for Local Variables Pad and for the debugger tooltips.  
 Previously the nodes wrapped debugger values - any requests were redirected to the underling value.
 The nodes are now based on Expressions and act as dum data storage.  When node is created the expression is evaluated and the properties (Image, Name, Text, Type) are stored locally in the node.  The node is immutable so its content can not be changed - the GUI need to create a fresh node.  This implies that the expression is evaluated only once - when the node is created.
 A node can have child nodes.  The child nodes are created on-demand using enumerators.  This is desirable since creation of node involves evaluation of expression.  It also prevents infinite recursion.</Change>
  <Change author="Matt Ward" date="01/05/2008">Updated to NUnit 2.4.6. The Unit Testing addin now uses the nunit-console's new /run command line parameter introduced in NUnit 2.4.6. This can be used to execute a test method, class or namespace.</Change>
  <Change author="David Srbecký" date="01/04/2008">Initial implementation of expression evaluator</Change>
  <Change author="David Srbecký" date="01/04/2008">Creation of expression does not evaluate the expression.</Change>
  <Change author="David Srbecký" date="01/04/2008">Support for array lower bounds</Change>
  <Change author="David Srbecký" date="01/03/2008">Added code for creating expressions</Change>
  <Change author="Matt Ward" date="01/02/2008">Updated the WixBinding and SharpDevelop's installer to use WiX 3.0.3621.0</Change>
  <Change author="David Srbecký" date="01/02/2008">Rename Function to StackFrame</Change>
  <Change author="David Srbecký" date="01/02/2008">Moved part of code from Function to MethodInfo</Change>
  <Change author="David Srbecký" date="01/02/2008">Tests for the last revision generic</Change>
  <Change author="David Srbecký" date="01/02/2008">Create generic ICorDebugType from ICorDebugClass and type arguments.  
 We can not get DebugType for a Function</Change>
  <Change author="David Srbecký" date="01/02/2008">Updated tests</Change>
  <Change author="David Srbecký" date="01/02/2008">Skeleton of the Expression classes</Change>
  <Change author="David Srbecký" date="01/02/2008">Removed the delegate-based persistence framework (will be replaced by expressions)</Change>
  <Change author="David Srbecký" date="01/02/2008">Bad idea - reverting last two revisions.  At least for the time being.</Change>
  <Change author="David Srbecký" date="01/01/2008">Preparing to remove ValueCollection</Change>
  <Change author="David Srbecký" date="01/01/2008">Values have no names.  Names will be part of higher level abstraction.</Change>
  <Change author="David Srbecký" date="01/01/2008">Removed some unused references.  
 Removed/disabled all Expression code.  It will return as higher level abstraction layer.</Change>
  <Change author="David Srbecký" date="01/01/2008">Removed expiry propagation for Values. 
 It seems there were only two cases:
 - Values expiring when stack frame exits
 - Values expiring immediately when debuggee is resumed
 These precisely correspond to these two cases: (respectively)
 - Values that have closed expression
 - Values that do not have closed expression
 The new behaviour is that every value expires when debuggee is resumed.
 Work in progress...</Change>
  <Change author="David Srbecký" date="01/01/2008">Removed the IMutable interface which propagated notifications about value changes.
 It do not provide 100% guarantee of notification.  For example:
 - If the user obtained a reference to same value from two places (eg classA.someInt and classB.someInt where classA == classB) then change in one place did not trigger notification in the other.  
 - Changing of the backing value for a property would not change the property.
 Idea for better system (if it is needed in the future):
 Each value refers to some memory range (eg reference it is 4 byte pointer in memory;  string is value on heap).
 Whenever a debugger is resumed all bets are off and anything could have changed.  
 Other then that value changes if and only if its memory range is modified by the user.
 Expression as a whole changes whenever any of the values involved changes;  if method call or property is involved then the whole expression may change when any memory is modified.</Change>
  <Change author="David Srbecký" date="01/01/2008">Added 'Expressions' test</Change>
  <Change author="David Srbecký" date="01/01/2008">Build compound expressions (eg "localVar.field[5]")</Change>
  <Change author="David Srbecký" date="01/01/2008">Moved code to the Value class:
 - Value.GetFieldValue
 - Value.GetPropertyValue
 - Value.SetPropertyValue
 - Value.InvokeMethod
 - Value.AsyncInvokeMethod</Change>
  <Change author="David Srbecký" date="01/01/2008">Removed file Value.Common.cs</Change>
  <Change author="David Srbecký" date="01/01/2008">Added specific Ast Expression so that more information can be preserved.  
 Renamed Testing attribute SummaryOnly to ToStringOnly  </Change>
  <Change author="David Srbecký" date="12/31/2007">Update Debugger.Tests</Change>
  <Change author="David Srbecký" date="12/31/2007">Removed classes ArrayElement, LocalVariable, MemberValue and MethodArgument.  They added no functionality to the Value class except for specifying how the Value was created. </Change>
  <Change author="David Srbecký" date="12/31/2007">Rename files (Value-*.cs =&gt; Value.*.cs)</Change>
  <Change author="David Srbecký" date="12/31/2007">Removed the NamedValue class.  All values now have name.</Change>
  <Change author="David Srbecký" date="12/31/2007">Added an Expression class which will be used to store AST expression for each value</Change>
  <Change author="David Srbecký" date="12/31/2007">Re-enabled debugger</Change>
  <Change author="Matt Ward" date="12/31/2007">XML editor now uses the text editor's CodeCompletionWindow instead of its own custom version.</Change>
  <Change author="Matt Ward" date="12/26/2007">Added pre-build event to run UpdateAssemblyInfo.exe to Python.Build.Tasks and ClassDiagram projects.</Change>
  <Change author="Matt Ward" date="12/26/2007">Removed NAnt file template from installer.</Change>
  <Change author="Matt Ward" date="12/26/2007">Added NAnt addin sample.</Change>
  <Change author="Matt Ward" date="12/18/2007">The SdiWorkspaceLayout now checks that the DefaultWorkbench ToolBars property is not null before adding controls to the toolbar panel. The ToolBars property is null if nothing is specified in the .addin file under the path /SharpDevelop/Workbench/ToolBar</Change>
  <Change author="Matt Ward" date="12/18/2007">Updated samples so they work with SharpDevelop 3.0</Change>
  <Change author="Matt Ward" date="12/16/2007">Moved Mono addin to samples and added support for Mono's new VB.NET compiler Vbnc.</Change>
  <Change author="Matt Ward" date="12/03/2007">Added IronPython addin with support for IronPython 1.1</Change>
  <Change author="Matt Ward" date="12/02/2007">Fixed problems with the XML Editor's XmlParser class preventing the XamlExpressionFinder from correctly identifying an attribute or element in a different namespace. The GetActiveElementStartPath, GetParentElementPath and GetQualifiedAttributeName all now correctly determine the namespace of the element or attribute if the xml has mixed namespaces.</Change>
  <Change author="Daniel Grunwald" date="11/25/2007">Layout configuration: Make "&lt;Reset to defaults&gt;" switch back to the Default layout.
 Do not store active layout, always start with Default. (fixes SD2-1268)
 Switch layout before starting the debugger (removes workaround for SD2-1325)
 Add LINQ support to VBNetOutputVisitor (not tested to generate valid code, but better than "throw new NotImplementedException();")</Change>
  <Change author="Matt Ward" date="11/25/2007">The CodeCoverageMethod.GetChildNamespaces method now correctly identifies the child namespaces when there are two that start the same and match up to just before the dot character.</Change>
  <Change author="Matt Ward" date="11/25/2007">Modifed nunit-console: Release version now being built. Changed the default behaviour of nunit-console where if a test fixture is specified on the command line then no other tests in the assembly are loaded. The default behaviour meant that a SetUpFixture class would not be run breaking tests that rely on it.</Change>
  <Change author="Matt Ward" date="11/25/2007">Removed unused files from setup and code coverage addin.</Change>
  <Change author="Matt Ward" date="11/25/2007">Updated installer: Removed nunit-console components used to target .NET 1.1. Added log4net component for NUnit 2.4.5.</Change>
  <Change author="Matt Ward" date="11/25/2007">Updated to NUnit 2.4.5. Removed support for running unit tests against .NET 1.1.</Change>
  <Change author="Daniel Grunwald" date="11/19/2007">Suppress warning message when SideBarConfig.xml does not exist (on first start after installation).
 Disable Debugger AddIn: it is WAY too unstable to be useful.</Change>
  <Change author="Matt Ward" date="11/19/2007">Changed CodeCoverage addin to use PartCover 2.2 instead of NCover.</Change>
  <Change author="Daniel Grunwald" date="11/19/2007">Improved finding xml documentation (now supports redirections). Add support for compiling for Compact Framework 3.5.</Change>
  <Change author="Matt Ward" date="11/04/2007">XmlView checks that the PrimaryFile is not null before MakeDirty is called in the DocumentChanged event handler. The text editor's filename is set to an empty string instead of null in the XslOutputView so the ParserService does not throw an ArgumentNullException when looking for a parser.</Change>
  <Change author="Daniel Grunwald" date="11/03/2007">Fixed build.</Change>
  <Change author="Daniel Grunwald" date="11/03/2007">Fixed forum-6858: Bug in New Project/New File Dialog: LastSelectedCategory is not saved correctly for sub-categories.</Change>
  <Change author="Daniel Grunwald" date="11/03/2007">Allow choosing the target framework when creating a new project.</Change>
  <Change author="Daniel Grunwald" date="10/31/2007">Fixed SD2-1379: When opening files, compile errors are not highlighted</Change>
  <Change author="Daniel Grunwald" date="10/28/2007">Fixed rare deadlock between QuickClassBrowserPanel locking a CompoundClass and then doing SearchType requests on a project content; and the parser thread updating a project content and then locking a compound class.</Change>
  <Change author="Daniel Grunwald" date="10/28/2007">Fixed tracking of current project: Improved finding of the first visible parent node of a project by not using lazy initialization for solution folder nodes. Do not set ProjectService.CurrentProject in SelectFile requests - when changing the active file, ProjectService.ActiveViewContentChanged already takes care of changing the current project.</Change>
  <Change author="Daniel Grunwald" date="10/28/2007">Disable code-completion inside string literals.
 Fixed control size in HistoryViewDisplayBinding/InfoPanel.</Change>
  <Change author="Daniel Grunwald" date="10/27/2007">Improve code completion after the "new" keyword.</Change>
  <Change author="Daniel Grunwald" date="10/27/2007">Go back to DockingWindow mode. This seems to solve the issue that text editor tooltips were sometimes not visible anymore after a layout change.</Change>
  <Change author="Daniel Grunwald" date="10/27/2007">Prevent crash in DockPanel.FocusManager.Activate when active pane was removed (e.g. the pad that was active when SharpDevelop was closed does not exist anymore after an AddIn was removed manually or SharpDevelop was updated)</Change>
  <Change author="Daniel Grunwald" date="10/27/2007">Fixed code completion after string literals ("hello, world".Length), fixed code completion in object initializers that use binary operators in the value (new MyType { P1 = someValue + someOtherValue }).</Change>
  <Change author="Daniel Grunwald" date="10/26/2007">Fixed build.</Change>
  <Change author="Daniel Grunwald" date="10/26/2007">FxCop AddIn: allow suppressing assembly-wide messages (e.g. AssembliesShouldHaveValidStrongNames)</Change>
  <Change author="Daniel Grunwald" date="10/26/2007">Make project conversion from MSBuild 2.0 to 3.5 explicit using a button in the project options.
 Remove .NET 1.x compilation support. Remove .NET CF 1.0 compilation support.
 Newly created projects for start as MSBuild 3.5 projects.</Change>
  <Change author="Daniel Grunwald" date="10/25/2007">Fixed bug in text editor drag+drop that could cause an undo group to stay open.</Change>
  <Change author="Daniel Grunwald" date="10/25/2007">Update to Boo 0.8.</Change>
  <Change author="Christoph Wille" date="10/21/2007">Updated setup for SHFB 1.6</Change>
  <Change author="Daniel Grunwald" date="10/21/2007">WinFormsUI/License.txt: disable Copy to Output Directory.
 Fixed a bug that could cause a file to be registered multiple times in the project content, showing all class members twice in the "quick class browser".</Change>
  <Change author="Christoph Wille" date="10/21/2007">Updated tools.build to copy new directories of SHFB 1.6</Change>
  <Change author="Christoph Wille" date="10/21/2007">SHFB 1.6.0.0
 http://www.codeplex.com/SHFB/Release/ProjectReleases.aspx?ReleaseId=5311</Change>
  <Change author="Christoph Wille" date="10/21/2007">Remove old version of SHFB</Change>
  <Change author="Daniel Grunwald" date="10/19/2007">Code completion: fixed some context detection bugs.</Change>
  <Change author="Daniel Grunwald" date="10/19/2007">Disabled COM registration for MyMeta.
 Add logging for text editor's undo stack.
 C# parser: fixed [module: ..] attributes
 C# code completion: suggest "assembly", "module", etc. when typing an attribute.</Change>
  <Change author="Daniel Grunwald" date="10/16/2007">Fixed two bugs:
 - When there were a generic and a non-generic method with identical parameters (e.g. "object GetSomething()" and "T GetSomething&lt;T&gt;()" ), running find references on one of them returned results for both methods.
 - Code completion was showing incorrect list for array initializers in field declarations ("static int[] field = { &lt;Ctrl+Space&gt; };")
 Improved GetHashCode + Equals code generator.</Change>
  <Change author="Daniel Grunwald" date="10/14/2007">Fixed attribute completion.</Change>
  <Change author="Daniel Grunwald" date="10/13/2007">Looks like I only committed the src folder in rev. 2714, here are the missing changes.</Change>
  <Change author="Daniel Grunwald" date="10/13/2007">Fixed forum-19285: code-completion for nested inner classes</Change>
  <Change author="Daniel Grunwald" date="10/12/2007">Add "Abort build" and "Set platform" commands to the "Build" menu.</Change>
  <Change author="Daniel Grunwald" date="10/12/2007">Assign DomRegion to ExpressionResult for describing the exact location where the expression was found.
 NRefactoryResolver now assigns the correct positions to nodes parsed by ParseExpression. This fixes code-completion on parenthesized query expressions.</Change>
  <Change author="Daniel Grunwald" date="10/12/2007">WorkbenchLayout: make the SharpDevelop main form structured similar to the DockPanelSuite sample application, use DockingMdi mode. This seems to solve some issues with the DockPanelSuite v2.1.</Change>
  <Change author="Daniel Grunwald" date="10/11/2007">Do not show read-only value-type fields and properties in collection initializer completion.</Change>
  <Change author="Daniel Grunwald" date="10/11/2007">Add code-completion support for object and collection initializers.</Change>
  <Change author="Dickon Field" date="10/09/2007">Added MyMeta and ICSharpCode.DataTools libraries which are required by new version of DbTools plugin</Change>
  <Change author="Daniel Grunwald" date="10/07/2007">Update to Cecil 0.6.
 Fixed some bugs.
 C# parser: include position information for statements/expressions.</Change>
--- a/src/AddIns/Misc/ServerTools/DbConnectionNode.cs
+++ b/src/AddIns/Misc/ServerTools/DbConnectionNode.cs
@ -0,0 +1,94 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 15/01/2008
 * Time: 18:15
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// View element representing a connection to a db server
 	/// </summary>
 	public class DbConnectionNode : TreeViewItem
 	{
 		private TablesNode _tablesNode;
 		private ViewsNode _viewsNode;
 		private StoreProcsNode _storedProcsNode;
 		private FunctionsNode _functionsNode;
 		/// <summary>
 		/// Dependent on the state this TreeViewItem should display an
 		/// appropriate icon.
 		/// TODO: select and embed appropriate resources from famfamfam
 		/// </summary>
 		private DbConnectionNodeState state;
 		/// <summary>
 		/// 
 		/// </summary>
 		/// <param name="name"></param>
 		/// <param name="header"></param>
 		public DbConnectionNode(string header)
 		{
 			this.Header = header;
 			this.State = DbConnectionNodeState.Closed;
 			this._tablesNode = new TablesNode();
 			this._viewsNode = new ViewsNode();
 			this._storedProcsNode = new StoreProcsNode();
 			this._functionsNode = new FunctionsNode();
 			this.Items.Add(_tablesNode);
 			this.Items.Add(_viewsNode);
 			this.Items.Add(_storedProcsNode);
 			this.Items.Add(_functionsNode);
 		}
 		public TablesNode TablesNode {
 			get {
 				return _tablesNode;
 			}
 		}
 		public ViewsNode ViewsNode {
 			get {
 				return _viewsNode;
 			}
 		}
 		public StoreProcsNode StoredProcsNode {
 			get {
 				return _storedProcsNode;
 			}
 		}
 		public FunctionsNode FunctionsNode {
 			get {
 				return _functionsNode;
 			}
 		}
 		public DbConnectionNode(string header, DbConnectionNodeState state): this(header)
 		{
 			this.State = state;
 		}
 		public DbConnectionNodeState State {
 			get {
 				return this.state;
 			}
 			set {
 				this.state = value;
 			}
 		}
 	}
 	public enum DbConnectionNodeState
 	{
 		Open,
 		Closed
 	}
 }
--- a/src/AddIns/Misc/ServerTools/DbConnectionsNode.cs
+++ b/src/AddIns/Misc/ServerTools/DbConnectionsNode.cs
@ -0,0 +1,28 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 22/01/2008
 * Time: 17:53
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of DbConnectionsTreeViewItem.
 	/// </summary>
 	public class DbConnectionsNode: TreeViewItem
 	{
 		public const string DBCONNECTIONS_NODE_HEADER = "Data Connections";
 		public DbConnectionsNode()
 		{
 			this.Header = DBCONNECTIONS_NODE_HEADER;
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/DbControlController.cs
+++ b/src/AddIns/Misc/ServerTools/DbControlController.cs
@ -0,0 +1,152 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 15/01/2008
 * Time: 16:47
 * 
 */
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Collections.Generic;
 using System.Data.OleDb;
 using System.Configuration;
 using MyMeta;
 using ICSharpCode.DataTools;
 using log=ICSharpCode.Core.LoggingService;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Bridges between the GUI object world and the world of connection strings and db objects
 	/// </summary>
 	public class DbControlController
 	{
 		private DbConnectionsNode _dbConnectionsNode;
 		public DbControlController(DbConnectionsNode dbConnectionsNode)
 		{
 			_dbConnectionsNode = dbConnectionsNode;	
 		}
 		/// <summary>
 		/// Creates or refreshes the tree of database objects below the DbConnectionNode 
 		/// </summary>
 		/// <param name="dbNode"></param>
 		public void UpdateDbConnectionNode(DbConnectionNode dbNode, ConnectionStringSettings s)
 		{
 			// update the TablesNode
 			UpdateTablesNode(dbNode.TablesNode, s);
 			// update the ViewsNode
 		}
 		public void UpdateTablesNode(TablesNode tablesNode, ConnectionStringSettings s)
 		{
 			// get a list of table names for the current connection to work with
 			OleDbConnection connection = null;
 			if (OleDbConnectionService.TryGetConnection(s.Name, out connection)) {
 				// now use mymeta to retrieve table metadata
 				MyMeta.dbRoot m = new MyMeta.dbRoot();
 			}
 		}
 		public void UpdateTableNode(DbConnectionNode dbNode, string connectionName)
 		{
 		}
 		/// <summary>
 		/// Creates a DbConnectionNode below the 'Data Connections' node of the ServerControl.
 		/// Simply iterate through the OleDbConnections available and:
 		/// 	- if a DbConnectionNode does not exist for one then add it
 		/// 	- if one does exist, then update its DbConnectionNodeState to correspond to the state of the
 		/// 	OleDbConnection.
 		/// </summary>
 		/// <param name="dbConnectionsNode"></param>
 		public void UpdateDbConnectionsNode()
 		{
 			log.Debug("updating connections node");
            ConnectionStringSettingsCollection c
            = OleDbConnectionService.GetConnectionSettingsCollection();
            // add a new DbConnectionNode for any connection that has been added
            List<string> headers = new List<string>();
            foreach (ConnectionStringSettings s in c)
            {
 				string settingsName = s.Name;
 				headers.Add(settingsName);
 				DbConnectionNode dbNode = (DbConnectionNode)_dbConnectionsNode.GetItemWithHeader(settingsName);
 				if (dbNode == null) {
 					// initial state for a new connection is always closed I think
 					dbNode = new DbConnectionNode(settingsName);
 					_dbConnectionsNode.Items.Add(dbNode);
 				} 
 				UpdateDbConnectionNode(dbNode, s);
            }
            _dbConnectionsNode.RemoveItemsWithHeaderNotIn(headers);
 		}
 		        /// <summary>
        /// Uses the DataLink dialog to define a new Oledb connection string,
        /// test it, and adds it to config.
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public void AddConnectionButton_Clicked(object sender, RoutedEventArgs e)
        {
        	log.Debug("add connection button clicked handler");
            MSDASC.DataLinks mydlg = new MSDASC.DataLinks();
            OleDbConnection oleCon = new OleDbConnection();
            ADODB._Connection aDOcon;
            //Cast the generic object that PromptNew returns to an ADODB._Connection.
            aDOcon = (ADODB._Connection)mydlg.PromptNew();
            if (aDOcon == null)
            {
            	return;
            }
            oleCon.ConnectionString = aDOcon.ConnectionString;
            oleCon.Open();
            if (oleCon.State.ToString() == "Open")
            {
                // If we get to here, we have a valid oledb
                // connection string, at least on the basis of the current
                // state of the platform that it refers to.
                // Now construct a name for the connection string settings based on
                // the attributes of the connection string and save it.
                // VS08 assumes the following naming scheme:
                // connection name ::= <provider name>.<host name>\<server name>.<catalog name>
                string provider = oleCon.Provider;
                string source = oleCon.DataSource;
                string catalogue = oleCon.Database;
                string dbServerName = @provider + ":" + @source + "." + @catalogue;
                OleDbConnectionService.Put(dbServerName, oleCon.ConnectionString);
                OleDbConnectionService.Save();
                oleCon.Close();
            }
            else
            {
                MessageBox.Show("Connection Failed");
            }
            this.UpdateDbConnectionsNode();
        }
        public void RefreshButton_Clicked(object sender, EventArgs eventArgs)
        {
        	log.Debug("refresh button clicked handler");
        }
 	}
 }
--- a/src/AddIns/Misc/ServerTools/FieldNode.cs
+++ b/src/AddIns/Misc/ServerTools/FieldNode.cs
@ -0,0 +1,35 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:58
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of FieldNode.
 	/// </summary>
 	public class FieldNode: TreeViewItem
 	{
 		private string _name;
 		private string _type;
 		public FieldNode(string name, string type)
 		{
 			_name = name;
 			_type = type;
 		}
 		public string FieldName {
 			get {
 				return this._name;
 			}
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/FunctionNode.cs
+++ b/src/AddIns/Misc/ServerTools/FunctionNode.cs
@ -0,0 +1,24 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:57
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of FunctionNode.
 	/// </summary>
 	public class FunctionNode: TreeViewItem
 	{
 		public FunctionNode()
 		{
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/FunctionsNode.cs
+++ b/src/AddIns/Misc/ServerTools/FunctionsNode.cs
@ -0,0 +1,27 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:57
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of FunctionsNode.
 	/// </summary>
 	public class FunctionsNode: TreeViewItem
 	{
 		public const string FUNCTIONS_NODE_HEADER = "Functions";
 		public FunctionsNode()
 		{
 			this.Header = FUNCTIONS_NODE_HEADER;
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.addin
+++ b/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.addin
@ -0,0 +1,24 @@
 <AddIn name        = "ICSharpCode.ServerTools"
       author      = "Dickon Field"
       url         = "www.softwarefabric.com"
       description = "A collection of components and tools to help develop db-aware apps... and more">
 	<Manifest>
 		<Identity name = "ICSharpCode.ServerTools"/>
 	</Manifest>
 	<Runtime>
 		<Import assembly ="ICSharpCode.ServerTools.dll"/>
 		<Import assembly="MyMeta.dll"/>
 		<Import assembly="ICSharpCode.DataTools.dll"/>
 	</Runtime>
 	<Path name = "/SharpDevelop/Workbench/Pads">
 		<Pad id       = "SharpServerToolsPad"
 		     category = "Main"
 		     title    = "Server Explorer"
 		     icon     = "ServerTool.Server"
 		     shortcut = "Control|Alt|D"
 		     class    = "ICSharpCode.ServerTools.ServerBrowserHost"/>
 	</Path>
 </AddIn>
--- a/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.cd
+++ b/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.cd
@ -0,0 +1,85 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <ClassDiagram Zoom="1" MajorVersion="1" MinorVersion="1" MembersFormat="FullSignature">
  <Class Name="ICSharpCode.ServerTools.DbControlController" Collapsed="False">
    <Position X="0.5" Y="0.5" Width="2.714167" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.ServerControl" Collapsed="False">
    <Position X="0.5" Y="3" Width="2.714167" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.DbConnectionNode" Collapsed="False">
    <Position X="0.5" Y="6.1" Width="2.557116" />
    <Compartments>
      <Compartment Name="Properties" Collapsed="False" />
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Enum Name="ICSharpCode.ServerTools.DbConnectionNodeState" Collapsed="False">
    <Position X="0.5" Y="8.3" Width="2.385544" />
    <Compartments />
  </Enum>
  <Class Name="ICSharpCode.ServerTools.DbConnectionsNode" Collapsed="False">
    <Position X="0.5" Y="9.7" Width="2.774967" />
    <Compartments>
      <Compartment Name="Properties" Collapsed="False" />
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.Properties.DbConnectionsNode" Collapsed="False">
    <Position X="0.5" Y="11.8" Width="2.670446" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.ServersNode" Collapsed="False">
    <Position X="0.5" Y="13.2" Width="2.321916" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.Servers.Properties.Resources" Collapsed="False">
    <Position X="0.5" Y="14.9" Width="2.472174" />
    <Compartments>
      <Compartment Name="Properties" Collapsed="False" />
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.Servers.Properties.Settings" Collapsed="False">
    <Position X="0.5" Y="17.4" Width="1.828166" />
    <Compartments>
      <Compartment Name="Properties" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.ServerBrowserHost" Collapsed="False">
    <Position X="0.5" Y="19.2" Width="2.542399" />
    <Compartments>
      <Compartment Name="Properties" Collapsed="False" />
      <Compartment Name="Methods" Collapsed="False" />
      <Compartment Name="Fields" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.TablesNode" Collapsed="False">
    <Position X="0.5" Y="21.6" Width="1.801403" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
    </Compartments>
  </Class>
  <Class Name="ICSharpCode.ServerTools.TableNode" Collapsed="False">
    <Position X="0.5" Y="23" Width="1.688073" />
    <Compartments>
      <Compartment Name="Methods" Collapsed="False" />
    </Compartments>
  </Class>
 </ClassDiagram>
--- a/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.csproj
+++ b/src/AddIns/Misc/ServerTools/ICSharpCode.ServerTools.csproj
@ -0,0 +1,177 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProductVersion>9.0.21022</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
    <ProjectGuid>{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ICSharpCode.ServerTools</RootNamespace>
    <AssemblyName>ICSharpCode.ServerTools</AssemblyName>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
    <NoStdLib>False</NoStdLib>
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>Full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\..\..\..\AddIns\AddIns\Misc\ServerTools\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
    <RegisterForComInterop>False</RegisterForComInterop>
    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
    <BaseAddress>4194304</BaseAddress>
    <PlatformTarget>AnyCPU</PlatformTarget>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.configuration" />
    <Reference Include="System.Core">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
    <Reference Include="System.EnterpriseServices" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Windows.Presentation">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
    <Reference Include="System.Xml.Linq">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
    <Reference Include="System.Data.DataSetExtensions">
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
    <Reference Include="UIAutomationProvider">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
    <Reference Include="WindowsBase">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
    <Reference Include="PresentationCore">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
    <Reference Include="PresentationFramework">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
    <Reference Include="WindowsFormsIntegration">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Page Include="ServerControl.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
    <Compile Include="DbConnectionNode.cs" />
    <Compile Include="DbConnectionsNode.cs" />
    <Compile Include="DbControlController.cs" />
    <Compile Include="FieldNode.cs" />
    <Compile Include="FunctionNode.cs" />
    <Compile Include="FunctionsNode.cs" />
    <Compile Include="ItemCollectionExtender.cs" />
    <Compile Include="Properties\DbConnectionsNode.cs" />
    <Compile Include="ServerControl.xaml.cs">
      <DependentUpon>ServerControl.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="ServersNode.cs" />
    <Compile Include="StoredProcNode.cs" />
    <Compile Include="StoreProcsNode.cs" />
    <Compile Include="TableNode.cs" />
    <Compile Include="TablesNode.cs" />
    <Compile Include="ViewNode.cs" />
    <Compile Include="ViewsNode.cs" />
    <ProjectReference Include="..\..\..\Libraries\ICSharpCode.DataTools\ICSharpCode.DataTools.csproj">
      <Project>{6CC3DF82-E815-483F-B4B5-85191064D981}</Project>
      <Name>ICSharpCode.DataTools</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\Libraries\MyMeta\MyMeta.csproj">
      <Project>{9B771930-6F16-4EC7-8CBB-C7B337EF5651}</Project>
      <Name>MyMeta</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
      <Name>ICSharpCode.SharpDevelop</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
      <Name>ICSharpCode.Core</Name>
    </ProjectReference>
    <COMReference Include="ADODB">
      <Guid>{EF53050B-882E-4776-B643-EDA472E8E3F2}</Guid>
      <VersionMajor>2</VersionMajor>
      <VersionMinor>7</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="MSDASC">
      <Guid>{2206CEB0-19C1-11D1-89E0-00C04FD7A829}</Guid>
      <VersionMajor>1</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <None Include="ICSharpCode.ServerTools.addin">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <Content Include="ICSharpCode.ServerTools.cd" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="Properties\Settings.Designer.cs">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
    <Compile Include="ServerBrowserHost.cs" />
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    </None>
    <AppDesigner Include="Properties\" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
  <Target Name="AfterBuild">
  </Target>
  -->
 </Project>
--- a/src/AddIns/Misc/ServerTools/ItemCollectionExtender.cs
+++ b/src/AddIns/Misc/ServerTools/ItemCollectionExtender.cs
@ -0,0 +1,59 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 16:30
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 using System.Collections.Generic;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of HeaderIndexedTreeViewItem.
 	/// </summary>
 	public static class ItemCollectionExtender
 	{
 		public static Object GetItemWithHeader(this TreeViewItem t, string header)
 		{
 			foreach(Object o in t.Items) {
 				HeaderedContentControl h = o as HeaderedContentControl;
 				if (h != null) {
 					if (h.Header.Equals(header)) {
 						return h;
 					}
 				}
 			}
 			return null;
 		}
 		public static void RemoveItemWithHeader(this TreeViewItem t, string header)
 		{
 			foreach(Object o in t.Items) {
 				HeaderedContentControl h = o as HeaderedContentControl;
 				if (h != null) {
 					if (h.Header.Equals(header)) {
 						t.Items.Remove(h);
 					}
 				}
 			}
 		}
 		public static void RemoveItemsWithHeaderNotIn(this TreeViewItem t, IList<string> headers)
 		{
 			foreach(Object o in t.Items) {
 				HeaderedContentControl h = o as HeaderedContentControl;
 				if (h != null) {
 					string header = h.Header as string;
 					if (!(headers.Contains(header))) {
 						t.Items.Remove(h);
 					}
 				}
 			}
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/Properties/AssemblyInfo.cs
+++ b/src/AddIns/Misc/ServerTools/Properties/AssemblyInfo.cs
@ -0,0 +1,57 @@
 using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SharpServerTools.Servers")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SharpServerTools.Servers")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
 //inside a <PropertyGroup>.  For example, if you are using US english
 //in your source files, set the <UICulture> to en-US.  Then uncomment
 //the NeutralResourceLanguage attribute below.  Update the "en-US" in
 //the line below to match the UICulture setting in the project file.
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 [assembly: ThemeInfo(
    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
    //(used if a resource is not found in the page, 
    // or application resource dictionaries)
    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
    //(used if a resource is not found in the page, 
    // app, or any theme specific resource dictionaries)
 )]
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
 //      Minor Version 
 //      Build Number
 //      Revision
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("TestServerControl")]
--- a/src/AddIns/Misc/ServerTools/ServerBrowserHost.cs
+++ b/src/AddIns/Misc/ServerTools/ServerBrowserHost.cs
@ -0,0 +1,63 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Dickon Field" email=""/>
 //     <version>$Revision$</version>
 // </file>
 using System;
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.ServerTools;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Enables a user to browse metadata associated with a db server and to open resources
 	/// referenced therein. The intention is to extend this to other server processes over
 	/// time.
 	/// </summary>
 	public class ServerBrowserHost : AbstractPadContent
 	{
 		ElementHost ctl;
 		/// <summary>
 		/// ServerBrowserTool hosts one or more TreeViews providing views of types
 		/// of server. Currently it shows only relational database servers.
 		/// </summary>
 		public ServerBrowserHost()
 		{
 			LoggingService.Debug("Loading ServerBrowserHost");
 			ctl = new ElementHost();
            ServerControl serverControl = new ServerControl();
            ctl.Child = serverControl;
 		}
 		/// <summary>
 		/// The <see cref="System.Windows.Forms.Control"/> representing the pad
 		/// </summary>
 		public override Control Control {
 			get {
 				return ctl;
 			}
 		}
 		/// <summary>
 		/// Rebuildes the pad
 		/// </summary>
 		public override void RedrawContent()
 		{
 		}
 		/// <summary>
 		/// Cleans up all used resources
 		/// </summary>
 		public override void Dispose()
 		{
 			ctl.Dispose();
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/ServerControl.xaml
+++ b/src/AddIns/Misc/ServerTools/ServerControl.xaml
@ -0,0 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
 	x:Class="ICSharpCode.ServerTools.ServerControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	Height="300"
 	Width="300">
 	<DockPanel>
 		<ToolBar
 			DockPanel.Dock="Top"
 			Name="serverToolBar"
 			Grid.Column="0"
 			Grid.Row="0">
 			<Button
 				Name="refreshButton">R</Button>
 			<Button
 				Name="stopRefreshButton">S</Button>
 			<Button
 				Name="addConnectionButton">A</Button>
 		</ToolBar>
 		<TreeView
 			Name="serverTree">
 		</TreeView>
 	</DockPanel>
 </UserControl>
--- a/src/AddIns/Misc/ServerTools/ServerControl.xaml.cs
+++ b/src/AddIns/Misc/ServerTools/ServerControl.xaml.cs
@ -0,0 +1,47 @@
 using System;
 using System.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Data;
 using System.Data.OleDb;
 using System.Data.Common;
 using System.Configuration;
 using System.Collections.Generic;
 using ICSharpCode.DataTools;
 using log = ICSharpCode.Core.LoggingService;
 namespace ICSharpCode.ServerTools
 {
    /// <summary>
    /// Interaction logic for UserControl1.xaml
    /// </summary>
    public partial class ServerControl : UserControl
    {
    	private DbConnectionsNode _dbConnectionsNode;
    	private ServersNode _serversNode;
    	public const int DATA_CONNECTIONS_VIEW_INDEX = 0;
    	public const int SERVERS_VIEW_INDEX = 1;
        public ServerControl()
        {
            InitializeComponent();
            _dbConnectionsNode = new DbConnectionsNode();
            _serversNode = new ServersNode();
            this.serverTree.Items.Add(_dbConnectionsNode);
            this.serverTree.Items.Add(_serversNode);
            DbControlController dbControlController = new DbControlController(_dbConnectionsNode);
            this.addConnectionButton.Click += dbControlController.AddConnectionButton_Clicked;
            this.refreshButton.Click += dbControlController.RefreshButton_Clicked;
            dbControlController.UpdateDbConnectionsNode();
        }
    }
 }
--- a/src/AddIns/Misc/ServerTools/ServersNode.cs
+++ b/src/AddIns/Misc/ServerTools/ServersNode.cs
@ -0,0 +1,27 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 22/01/2008
 * Time: 18:04
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of ServersNode.
 	/// </summary>
 	public class ServersNode: TreeViewItem
 	{
 		public const string SERVERS_NODE_HEADER = "Servers";
 		public ServersNode()
 		{
 			this.Header = SERVERS_NODE_HEADER;
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/StoreProcsNode.cs
+++ b/src/AddIns/Misc/ServerTools/StoreProcsNode.cs
@ -0,0 +1,27 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 16:15
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of StoreProcsNode.
 	/// </summary>
 	public class StoreProcsNode: TreeViewItem
 	{
 		public const string STORED_PROCS_NODE_HEADER = "Stored Procedures";
 		public StoreProcsNode()
 		{
 			this.Header = STORED_PROCS_NODE_HEADER;
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/StoredProcNode.cs
+++ b/src/AddIns/Misc/ServerTools/StoredProcNode.cs
@ -0,0 +1,24 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 16:15
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of StoredProcNode.
 	/// </summary>
 	public class StoredProcNode: TreeViewItem
 	{
 		public StoredProcNode()
 		{
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/TableNode.cs
+++ b/src/AddIns/Misc/ServerTools/TableNode.cs
@ -0,0 +1,24 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:46
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of TableNode.
 	/// </summary>
 	public class TableNode: TreeViewItem
 	{
 		public TableNode()
 		{
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/TablesNode.cs
+++ b/src/AddIns/Misc/ServerTools/TablesNode.cs
@ -0,0 +1,27 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:42
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of TablesNode.
 	/// </summary>
 	public class TablesNode: TreeViewItem
 	{
 		public const string TABLES_NODE_HEADER = "Tables";
 		public TablesNode()
 		{
 			this.Header = TABLES_NODE_HEADER;
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/ViewNode.cs
+++ b/src/AddIns/Misc/ServerTools/ViewNode.cs
@ -0,0 +1,24 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:56
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of ViewNode.
 	/// </summary>
 	public class ViewNode: TreeViewItem
 	{
 		public ViewNode()
 		{
 		}
 	}
 }
--- a/src/AddIns/Misc/ServerTools/ViewsNode.cs
+++ b/src/AddIns/Misc/ServerTools/ViewsNode.cs
@ -0,0 +1,27 @@
 /*
 * Created by SharpDevelop.
 * User: dickon
 * Date: 07/02/2008
 * Time: 15:56
 * 
 * 
 */
 using System;
 using System.Windows.Controls;
 namespace ICSharpCode.ServerTools
 {
 	/// <summary>
 	/// Description of ViewsNode.
 	/// </summary>
 	public class ViewsNode: TreeViewItem
 	{
 		public const string VIEWS_NODE_HEADER = "Views";
 		public ViewsNode()
 		{
 			this.Header = VIEWS_NODE_HEADER;
 		}
 	}
 }
--- a/src/Libraries/ICSharpCode.DataTools/OleDbUtils.cs
+++ b/src/Libraries/ICSharpCode.DataTools/OleDbUtils.cs
@ -14,8 +14,15 @@ using log = ICSharpCode.Core.LoggingService;
 namespace ICSharpCode.DataTools
 {
-
+	/// <summary>
-    public static class OleDbConnectionUtil
+	/// <para>This class maintains a dictionary of OleDbConnections backed by a file -
 	/// it does not open the connections or maintain a pool of connections. That would be
 	/// a bad idea since most oledb providers implement connection pooling themselves.</para>
 	/// <para>It does validate connection strings as they are submitted - or rather it delegates
 	/// this validation to the <code>OleDbConnectionStringBuilder</code>
 	/// </para>
 	/// </summary>
    public static class OleDbConnectionService 
    {
        /// <summary>
        /// Returns a single connection, unopened
@ -26,10 +33,18 @@ namespace ICSharpCode.DataTools
        /// but is not a valid oledb connection string</exception>
        /// 
        public const string CONNECTION_STRINGS_FILE = "DatabaseConnections.xml";
-
+		
        // a standard .net class representing a collection of connection settings
        private static ConnectionStringSettingsCollection cssc = null;
        // an internal cache of OleDbConnections that have so far been created.
        // Note that OleDbConnectionService does not know of care whether the connections are open or closed
        // it simply keeps a cache of the created objects indexed by the name of the ConnectionStringSettings.
        private static Dictionary<string, OleDbConnection> connections = 
 			new Dictionary<string, OleDbConnection>();
-        public static bool TryGet(string connectionName, out OleDbConnection conn)
+        private static bool TryGet(string connectionName, out OleDbConnection conn)
        {
            try
            {
@ -46,6 +61,20 @@ namespace ICSharpCode.DataTools
                return false;
            }
        }
        public static bool TryGetConnection(string connectionName, out OleDbConnection connection)
 		{
 			if (connections.TryGetValue(connectionName, out connection)) {
 				return true;
 			} else {
 				if (TryGet(connectionName, out connection)) {
 					connections.Add(connectionName, connection);
 					return true;
 				}else {
        			return false;
        		} 
        	}
 		}
        /// <summary>
        /// Validates and adds an oledb connection string to the internal cache.
@ -69,7 +98,7 @@ namespace ICSharpCode.DataTools
        /// <summary>
        /// Returns all Connections unopened
        /// </summary>
-        public static List<OleDbConnection> Connections
+        public static Dictionary<string, OleDbConnection> Connections
        {
            get
            {
@ -79,18 +108,22 @@ namespace ICSharpCode.DataTools
                List<OleDbConnection> results = new List<OleDbConnection>();
                foreach (ConnectionStringSettings c in settingsCollection)
                {
                	if (connections.ContainsKey(c.Name)) {
                		continue;
                	}
                    try
                    {
                        OleDbConnectionStringBuilder builder = new OleDbConnectionStringBuilder(c.ConnectionString); // ArgumentException thrown here
                        OleDbConnection conn = new OleDbConnection(builder.ConnectionString);
-                        results.Add(conn);
+                        connections.Add(c.Name, conn);
                    }
                    catch (ArgumentException)
                    {
-                        // do nothing, this is acceptable
+                        log.Info("an invalid connection string was found in the file " +
                    	         CONNECTION_STRINGS_FILE + ": " + c.ToString());
                    }
                }
-                return results;
+                return connections;
            }
        }
@ -129,7 +162,7 @@ namespace ICSharpCode.DataTools
            {
                // again, if the file contains some extraneous data it must have been corrupted or
                // manually edited - in this case ignore it
-                log.Debug("bad data found trying to read in the ConnectionSettingsCollection from file - " 
+                log.Info("bad data found trying to read in the ConnectionSettingsCollection from file - " 
                    + "please check the content of the file at: " + filePath);
            }
            return cssc;
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@ -1,176 +1,176 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-# SharpDevelop 3.0.0.2847
+# SharpDevelop 3.0.0.2813
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.ServerTools", "AddIns\DisplayBindings\ServerTools\ICSharpCode.ServerTools.csproj", "{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.ServerTools", "AddIns\Misc\ServerTools\ICSharpCode.ServerTools.csproj", "{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}"
-EndProject
+	ProjectSection(SolutionItems) = postProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.DataTools", "Libraries\ICSharpCode.DataTools\ICSharpCode.DataTools.csproj", "{6CC3DF82-E815-483F-B4B5-85191064D981}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMeta", "Libraries\MyMeta\MyMeta.csproj", "{9B771930-6F16-4EC7-8CBB-C7B337EF5651}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMeta", "Libraries\MyMeta\MyMeta.csproj", "{9B771930-6F16-4EC7-8CBB-C7B337EF5651}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.DataTools", "Libraries\ICSharpCode.DataTools\ICSharpCode.DataTools.csproj", "{6CC3DF82-E815-483F-B4B5-85191064D981}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 EndProject
-Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -528,75 +528,75 @@ Global
 		{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{8CF1EB90-324F-4AA9-BAA2-DEF87392CE86} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
 		{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{9B771930-6F16-4EC7-8CBB-C7B337EF5651} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}
 		{388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
 		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
 		{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
 		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{6CC3DF82-E815-483F-B4B5-85191064D981} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{9B771930-6F16-4EC7-8CBB-C7B337EF5651} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		B13EFF7F-7EA4-4B68-A375-D112105E9182 = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		B13EFF7F-7EA4-4B68-A375-D112105E9182 = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 	EndGlobalSection
 EndGlobal