Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

16 files changed, 502 insertions, 207 deletions

diff --git a/Prebuild/src/Core/Nodes/AuthorNode.cs b/Prebuild/src/Core/Nodes/AuthorNode.cs
index 20e72c0..4c415bb 100644
--- a/Prebuild/src/Core/Nodes/AuthorNode.cs
+++ b/Prebuild/src/Core/Nodes/AuthorNode.cs
@@ -24,8 +24,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
diff --git a/Prebuild/src/Core/Nodes/CleanFilesNode.cs b/Prebuild/src/Core/Nodes/CleanFilesNode.cs
new file mode 100644
index 0000000..71405f9
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/CleanFilesNode.cs
@@ -0,0 +1,80 @@
+#region BSD License
+/*
+Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions 
+  and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+  and the following disclaimer in the documentation and/or other materials provided with the 
+  distribution. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+    [DataNode("CleanFiles")]
+    public class CleanFilesNode : DataNode
+    {
+        #region Fields
+
+        private string m_Pattern;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the signature.
+        /// </summary>
+        /// <value>The signature.</value>
+        public string Pattern
+        {
+            get
+            {
+                return m_Pattern;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException("node");
+            }
+
+            m_Pattern = Helper.AttributeValue(node, "pattern", String.Empty); ;
+            m_Pattern = m_Pattern.Trim();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Prebuild/src/Core/Nodes/CleanupNode.cs b/Prebuild/src/Core/Nodes/CleanupNode.cs
new file mode 100644
index 0000000..b8131b0
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/CleanupNode.cs
@@ -0,0 +1,85 @@
+#region BSD License
+/*
+Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions 
+  and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+  and the following disclaimer in the documentation and/or other materials provided with the 
+  distribution. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+
+namespace Prebuild.Core.Nodes
+{
+    [DataNode("Cleanup")]
+    public class CleanupNode : DataNode
+    {
+                #region Fields
+
+                private List<CleanFilesNode> m_CleanFiles = new List<CleanFilesNode>();
+
+                #endregion
+
+                #region Properties
+
+                /// <summary>
+                /// Gets the signature.
+                /// </summary>
+                /// <value>The signature.</value>
+        public List<CleanFilesNode> CleanFiles
+                {
+                        get
+                        {
+                                return m_CleanFiles;
+                        }
+                }
+
+                #endregion
+
+                #region Public Methods
+
+                /// <summary>
+                /// Parses the specified node.
+                /// </summary>
+                /// <param name="node">The node.</param>
+                public override void Parse(XmlNode node)
+                {
+                        if( node == null )
+                        {
+                                throw new ArgumentNullException("node");
+                        }
+
+            foreach (XmlNode child in node.ChildNodes)
+            {
+                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                if (dataNode is CleanFilesNode)
+                {
+                    m_CleanFiles.Add((CleanFilesNode)dataNode);
+                }
+            }
+                }
+
+                #endregion
+    }
+}
\ No newline at end of file
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index 67d78d5..cd2f740 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -41,6 +41,7 @@ namespace Prebuild.Core.Nodes
                 #region Fields
 
                 private string m_Name = "unknown";
+                private string m_Platform = "AnyCPU";
                 private OptionsNode m_Options;
 
                 #endregion
@@ -84,6 +85,33 @@ namespace Prebuild.Core.Nodes
                 }
 
                 /// <summary>
+                /// Identifies the platform for this specific configuration.
+                /// </summary>
+                public string Platform
+                {
+                        get
+                        {
+                                return m_Platform;
+                        }
+                        set
+                        {
+                                switch ((value + "").ToLower())
+                                {
+                                case "x86":
+                                case "x64":
+                                        m_Platform = value;
+                                        break;
+                                case "itanium":
+                                        m_Platform = "Itanium";
+                                        break;
+                                default:
+                                        m_Platform = "AnyCPU";
+                                        break;
+                                }
+                        }
+                }
+
+                /// <summary>
                 /// Gets the name.
                 /// </summary>
                 /// <value>The name.</value>
@@ -96,6 +124,22 @@ namespace Prebuild.Core.Nodes
                 }
 
                 /// <summary>
+                /// Gets the name and platform for the configuration.
+                /// </summary>
+                /// <value>The name and platform.</value>
+                public string NameAndPlatform
+                {
+                        get
+                        {
+                string platform = m_Platform;
+                if (platform == "AnyCPU")
+                    platform = "Any CPU";
+
+                                return String.Format("{0}|{1}", m_Name, platform);
+                        }
+                }
+
+                /// <summary>
                 /// Gets or sets the options.
                 /// </summary>
                 /// <value>The options.</value>
@@ -122,7 +166,9 @@ namespace Prebuild.Core.Nodes
                 public override void Parse(XmlNode node)
                 {
                         m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        if( node == null )
+                        Platform = Helper.AttributeValue(node, "platform", m_Platform);
+
+                        if (node == null)
                         {
                                 throw new ArgumentNullException("node");
                         }
@@ -159,6 +205,7 @@ namespace Prebuild.Core.Nodes
                 {
                         ConfigurationNode ret = new ConfigurationNode();
                         ret.m_Name = m_Name;
+                        ret.m_Platform = m_Platform;
                         m_Options.CopyTo(ret.m_Options);
                         return ret;
                 }
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs b/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs
new file mode 100644
index 0000000..1c38d9e
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ConfigurationNodeCollection.cs
@@ -0,0 +1,71 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions 
+  and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+  and the following disclaimer in the documentation and/or other materials provided with the 
+  distribution. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#endregion
+
+using System.Collections.Generic;
+
+namespace Prebuild.Core.Nodes
+{
+        /// <summary>
+        /// Implements a specialized list of configuration nodes which allows for lookup via
+        /// configuration name and platform.
+        /// </summary>
+        public class ConfigurationNodeCollection : List<ConfigurationNode>
+        {
+                #region Properties
+
+                public ConfigurationNode this[string nameAndPlatform]
+                {
+                        get
+                        {
+                                foreach (ConfigurationNode configurationNode in this)
+                                {
+                                        if (configurationNode.NameAndPlatform == nameAndPlatform)
+                                        {
+                                                return configurationNode;
+                                        }
+                                }
+
+                                return null;
+                        }
+
+                        set
+                        {
+                                // See if the node 
+                                ConfigurationNode configurationNode = this[nameAndPlatform];
+
+                                if (configurationNode != null)
+                                {
+                                        this[IndexOf(configurationNode)] = value;
+                                }
+                                else
+                                {
+                                        Add(value);
+                                }
+                        }
+                }
+
+                #endregion
+        }
+}
diff --git a/Prebuild/src/Core/Nodes/DataNode.cs b/Prebuild/src/Core/Nodes/DataNode.cs
index 763e6c3..318b13c 100644
--- a/Prebuild/src/Core/Nodes/DataNode.cs
+++ b/Prebuild/src/Core/Nodes/DataNode.cs
@@ -104,7 +104,7 @@ namespace Prebuild.Core.Nodes
                                 
                                 foreach (string type in WebTypes)
                                 {
-                                        if (path.EndsWith(string.Format("{0}{1}", type, extension)))
+                    if (path.EndsWith(type))
                                         {
                                                 return SubType.CodeBehind;
                                         }
diff --git a/Prebuild/src/Core/Nodes/DatabaseProjectNode.cs b/Prebuild/src/Core/Nodes/DatabaseProjectNode.cs
index 27c2051..278ecd8 100644
--- a/Prebuild/src/Core/Nodes/DatabaseProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/DatabaseProjectNode.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
diff --git a/Prebuild/src/Core/Nodes/DescriptionNode.cs b/Prebuild/src/Core/Nodes/DescriptionNode.cs
index 353a5ae..d1293a0 100644
--- a/Prebuild/src/Core/Nodes/DescriptionNode.cs
+++ b/Prebuild/src/Core/Nodes/DescriptionNode.cs
@@ -24,8 +24,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
diff --git a/Prebuild/src/Core/Nodes/FileNode.cs b/Prebuild/src/Core/Nodes/FileNode.cs
index 1520fcb..01cea1e 100644
--- a/Prebuild/src/Core/Nodes/FileNode.cs
+++ b/Prebuild/src/Core/Nodes/FileNode.cs
@@ -54,7 +54,15 @@ namespace Prebuild.Core.Nodes
                 /// <summary>
                 /// 
                 /// </summary>
-                EmbeddedResource
+                EmbeddedResource,
+                /// <summary>
+                /// 
+                /// </summary>
+                ApplicationDefinition,
+                /// <summary>
+                /// 
+                /// </summary>
+                Page
         }
 
         /// <summary>
@@ -264,6 +272,12 @@ namespace Prebuild.Core.Nodes
                                 m_Valid = false;
                                 Kernel.Instance.Log.Write(LogType.Warning, "File does not exist: {0}", m_Path);
                         }
+
+            if (System.IO.Path.GetExtension(m_Path) == ".settings")
+            {
+                m_SubType = SubType.Settings;
+                m_BuildAction = BuildAction.None;
+            }
                 }
 
                 #endregion
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
index dc306c2..23a716c 100644
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -24,8 +24,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
@@ -42,41 +41,19 @@ namespace Prebuild.Core.Nodes
         {
                 #region Fields
 
-                private StringCollection m_Files;
-                private Hashtable m_BuildActions;
-                private Hashtable m_SubTypes;
-                private Hashtable m_ResourceNames;
-                private Hashtable m_CopyToOutputs;
-                private Hashtable m_Links;
-                private Hashtable m_LinkPaths;
-        private Hashtable m_PreservePaths;
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public FilesNode()
-                {
-                        m_Files = new StringCollection();
-                        m_BuildActions = new Hashtable();
-                        m_SubTypes = new Hashtable();
-                        m_ResourceNames = new Hashtable();
-                        m_CopyToOutputs = new Hashtable();
-                        m_Links = new Hashtable();
-                        m_LinkPaths = new Hashtable();
-                        m_PreservePaths = new Hashtable();
-        }
+                private readonly List<string> m_Files = new List<string>();
+                private readonly Dictionary<string,BuildAction> m_BuildActions = new Dictionary<string, BuildAction>();
+                private readonly Dictionary<string, SubType> m_SubTypes = new Dictionary<string, SubType>();
+                private readonly Dictionary<string, string> m_ResourceNames = new Dictionary<string, string>();
+                private readonly Dictionary<string, CopyToOutput> m_CopyToOutputs = new Dictionary<string, CopyToOutput>();
+                private readonly Dictionary<string, bool> m_Links = new Dictionary<string, bool>();
+                private readonly Dictionary<string, string> m_LinkPaths = new Dictionary<string, string>();
+        private readonly Dictionary<string, bool> m_PreservePaths = new Dictionary<string, bool>();
 
                 #endregion
 
                 #region Properties
 
-                /// <summary>
-                /// 
-                /// </summary>
                 public int Count
                 {
                         get
@@ -89,11 +66,6 @@ namespace Prebuild.Core.Nodes
 
                 #region Public Methods
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
                 public BuildAction GetBuildAction(string file)
                 {
                         if(!m_BuildActions.ContainsKey(file))
@@ -101,41 +73,41 @@ namespace Prebuild.Core.Nodes
                                 return BuildAction.Compile;
                         }
 
-                        return (BuildAction)m_BuildActions[file];
+                        return m_BuildActions[file];
                 }
 
                 public CopyToOutput GetCopyToOutput(string file)
                 {
-                        if (!this.m_CopyToOutputs.ContainsKey(file))
+                        if (!m_CopyToOutputs.ContainsKey(file))
                         {
                                 return CopyToOutput.Never;
                         }
-                        return (CopyToOutput) this.m_CopyToOutputs[file];
+                        return m_CopyToOutputs[file];
                 }
 
                 public bool GetIsLink(string file)
                 {
-                        if (!this.m_Links.ContainsKey(file))
+                        if (!m_Links.ContainsKey(file))
                         {
                                 return false;
                         }
-                        return (bool) this.m_Links[file];
+                        return m_Links[file];
                 }
 
+        public bool Contains(string file)
+        {
+            return m_Files.Contains(file);
+        }
+
                 public string GetLinkPath( string file )
                 {
-                        if ( !this.m_LinkPaths.ContainsKey( file ) )
+                        if ( !m_LinkPaths.ContainsKey( file ) )
                         {
                                 return string.Empty;
                         }
-                        return (string)this.m_LinkPaths[ file ];
+                        return m_LinkPaths[ file ];
                 }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
                 public SubType GetSubType(string file)
                 {
                         if(!m_SubTypes.ContainsKey(file))
@@ -143,29 +115,19 @@ namespace Prebuild.Core.Nodes
                                 return SubType.Code;
                         }
 
-                        return (SubType)m_SubTypes[file];
+                        return m_SubTypes[file];
                 }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="file"></param>
-                /// <returns></returns>
                 public string GetResourceName(string file)
                 {
                         if(!m_ResourceNames.ContainsKey(file))
                         {
-                                return "";
+                                return string.Empty;
                         }
 
-                        return (string)m_ResourceNames[file];
+                        return m_ResourceNames[file];
                 }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
         public bool GetPreservePath( string file )
         {
             if ( !m_PreservePaths.ContainsKey( file ) )
@@ -173,13 +135,9 @@ namespace Prebuild.Core.Nodes
                 return false;
             }
 
-            return (bool)m_PreservePaths[ file ];
+            return m_PreservePaths[ file ];
         }
 
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="node"></param>
                 public override void Parse(XmlNode node)
                 {
                         if( node == null )
@@ -200,10 +158,10 @@ namespace Prebuild.Core.Nodes
                                                         m_BuildActions[fileNode.Path] = fileNode.BuildAction;
                                                         m_SubTypes[fileNode.Path] = fileNode.SubType;
                                                         m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
-                            this.m_PreservePaths[ fileNode.Path ] = fileNode.PreservePath;
-                            this.m_Links[ fileNode.Path ] = fileNode.IsLink;
-                                                        this.m_LinkPaths[ fileNode.Path ] = fileNode.LinkPath;
-                                                        this.m_CopyToOutputs[ fileNode.Path ] = fileNode.CopyToOutput;
+                            m_PreservePaths[ fileNode.Path ] = fileNode.PreservePath;
+                            m_Links[ fileNode.Path ] = fileNode.IsLink;
+                                                        m_LinkPaths[ fileNode.Path ] = fileNode.LinkPath;
+                                                        m_CopyToOutputs[ fileNode.Path ] = fileNode.CopyToOutput;
 
                                                 }
                                         }
@@ -216,13 +174,16 @@ namespace Prebuild.Core.Nodes
                                                 if (!m_Files.Contains(file))
                                                 {
                                                         m_Files.Add(file);
-                            m_BuildActions[ file ] = matchNode.BuildAction == null ? GetBuildActionByFileName(file) : matchNode.BuildAction;
-                                                        m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value;
+                                                    if (matchNode.BuildAction == null)
+                                m_BuildActions[file] = GetBuildActionByFileName(file);
+                                                    else
+                                m_BuildActions[file] = matchNode.BuildAction.Value;
+                                                    m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value;
                             m_ResourceNames[ file ] = matchNode.ResourceName;
-                            this.m_PreservePaths[ file ] = matchNode.PreservePath;
-                            this.m_Links[ file ] = matchNode.IsLink;
-                                                        this.m_LinkPaths[ file ] = matchNode.LinkPath;
-                                                        this.m_CopyToOutputs[ file ] = matchNode.CopyToOutput;
+                            m_PreservePaths[ file ] = matchNode.PreservePath;
+                            m_Links[ file ] = matchNode.IsLink;
+                                                        m_LinkPaths[ file ] = matchNode.LinkPath;
+                                                        m_CopyToOutputs[ file ] = matchNode.CopyToOutput;
 
                                                 }
                                         }
@@ -232,11 +193,7 @@ namespace Prebuild.Core.Nodes
 
                 // TODO: Check in to why StringCollection's enumerator doesn't implement
                 // IEnumerator?
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <returns></returns>
-                public StringEnumerator GetEnumerator()
+                public IEnumerator<string> GetEnumerator()
                 {
                         return m_Files.GetEnumerator();
                 }
diff --git a/Prebuild/src/Core/Nodes/MatchNode.cs b/Prebuild/src/Core/Nodes/MatchNode.cs
index 656d7d0..9735265 100644
--- a/Prebuild/src/Core/Nodes/MatchNode.cs
+++ b/Prebuild/src/Core/Nodes/MatchNode.cs
@@ -25,7 +25,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
@@ -33,7 +32,6 @@ using System.Xml;
 using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
 using Prebuild.Core.Utilities;
-using System.Collections;
 
 namespace Prebuild.Core.Nodes
 {
@@ -45,7 +43,7 @@ namespace Prebuild.Core.Nodes
         {
                 #region Fields
 
-        private readonly StringCollection m_Files = new StringCollection();
+        private readonly List<string> m_Files = new List<string>();
                 private Regex m_Regex;
                 private BuildAction? m_BuildAction;
                 private SubType? m_SubType;
@@ -63,7 +61,7 @@ namespace Prebuild.Core.Nodes
                 /// <summary>
                 /// 
                 /// </summary>
-                public StringCollection Files
+                public IEnumerable<string> Files
                 {
                         get
                         {
@@ -97,7 +95,7 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                                return this.m_CopyToOutput;
+                                return m_CopyToOutput;
                         }
                 }
 
@@ -105,7 +103,7 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                                return this.m_Link;
+                                return m_Link;
                         }
                 }
 
@@ -113,7 +111,7 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                                return this.m_LinkPath;
+                                return m_LinkPath;
                         }
                 }
                 /// <summary>
@@ -149,21 +147,35 @@ namespace Prebuild.Core.Nodes
                 private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex, List<ExcludeNode> exclusions)
                 {
                         Match match;
-            Boolean excludeFile;
-                        try
+                    try
                         {
                                 string[] files;
 
-                                if(!useRegex)
+                            Boolean excludeFile;
+                            if(!useRegex)
                                 {
-                                        files = Directory.GetFiles(path, pattern);
+                    try
+                    {
+                        files = Directory.GetFiles(path, pattern);
+                    }
+                    catch (IOException)
+                    {
+                        // swallow weird IOException error when running in a virtual box
+                        // guest OS on a network share when the host OS is not Windows.  
+                        // This seems to happen on network shares
+                        // when no files match, and may be related to this report:
+                        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=254546
+
+                        files = null;
+                    }
+
                                         if(files != null)
                                         {
-                                                string fileTemp;
-                                                foreach (string file in files)
+                                            foreach (string file in files)
                                                 {
                             excludeFile = false;
-                                                        if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
+                                                    string fileTemp;
+                                                    if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
                                                         {
                                                                 fileTemp = file.Substring(2);
                                                         }
@@ -187,47 +199,64 @@ namespace Prebuild.Core.Nodes
 
                                                 }
                                         }
-                                        else
-                                        {
-                                                return;
-                                        }
+
+                    // don't call return here, because we may need to recursively search directories below
+                    // this one, even if no matches were found in this directory.
                                 }
                                 else
                                 {
-                                        files = Directory.GetFiles(path);
-                                        foreach(string file in files)
-                                        {
-                        excludeFile = false;
-
-                                                match = m_Regex.Match(file);
-                                                if(match.Success)
-                                                {
-                            // Check all excludions and set flag if there are any hits.
-                            foreach ( ExcludeNode exclude in exclusions )
-                            {
-                                Regex exRegEx = new Regex( exclude.Pattern );
-                                match = exRegEx.Match( file );
-                                excludeFile |= !match.Success;
-                            }
+                                        try
+                                        {
+                                                files = Directory.GetFiles(path);
+                                        }
+                    catch (IOException)
+                    {
+                        // swallow weird IOException error when running in a virtual box
+                        // guest OS on a network share.
+                        files = null;
+                    }
+
+                    if (files != null)
+                    {
+                        foreach (string file in files)
+                        {
+                            excludeFile = false;
 
-                            if ( !excludeFile )
+                            match = m_Regex.Match(file);
+                            if (match.Success)
                             {
-                                m_Files.Add( file );
+                                // Check all excludions and set flag if there are any hits.
+                                foreach (ExcludeNode exclude in exclusions)
+                                {
+                                    Regex exRegEx = new Regex(exclude.Pattern);
+                                    match = exRegEx.Match(file);
+                                    excludeFile |= !match.Success;
+                                }
+
+                                if (!excludeFile)
+                                {
+                                    m_Files.Add(file);
+                                }
                             }
-                                                }
-                                        }
+                        }
+                    }
                                 }
                 
                                 if(recurse)
                                 {
                                         string[] dirs = Directory.GetDirectories(path);
                                         if(dirs != null && dirs.Length > 0)
-                                        {
-                                                foreach(string str in dirs)
-                                                {
-                                                        RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex, exclusions);
-                                                }
-                                        }
+                    {
+                        foreach (string str in dirs)
+                        {
+                            // hack to skip subversion folders.  Not having this can cause
+                            // a significant performance hit when running on a network drive.
+                            if (str.EndsWith(".svn"))
+                                continue;
+
+                            RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex, exclusions);
+                        }
+                    }
                                 }
                         }
                         catch(DirectoryNotFoundException)
@@ -266,14 +295,14 @@ namespace Prebuild.Core.Nodes
                         //string subType = Helper.AttributeValue(node, "subType", string.Empty);
                         //if (subType != String.Empty)
                         //    m_SubType = (SubType)Enum.Parse(typeof(SubType), subType);
-                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
-                        this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
-                        this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
-                        if ( this.m_Link == true )
+                        m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName);
+                        m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", m_CopyToOutput.ToString()));
+                        m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+                        if ( m_Link )
                         {
-                                this.m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
+                                m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
                         }
-            this.m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
+            m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
 
 
                         if(path != null && path.Length == 0)
@@ -318,11 +347,19 @@ namespace Prebuild.Core.Nodes
 
             RecurseDirectories( path, pattern, recurse, useRegex, m_Exclusions );
 
-                        if(m_Files.Count < 1)
-                        {
-                                throw new WarningException("Match returned no files: {0}{1}", Helper.EndPath(path), pattern);
-                        }
-                        m_Regex = null;
+            if (m_Files.Count < 1)
+            {
+                // Include the project name when the match node returns no matches to provide extra
+                // debug info.
+                ProjectNode project = Parent.Parent as ProjectNode;
+                string projectName = "";
+
+                if (project != null)
+                    projectName = " in project " + project.AssemblyName;
+
+                throw new WarningException("Match" + projectName + " returned no files: {0}{1}", Helper.EndPath(path), pattern);
+            }
+            m_Regex = null;
                 }
 
                 #endregion
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs
index b63034b..577de71 100644
--- a/Prebuild/src/Core/Nodes/OptionsNode.cs
+++ b/Prebuild/src/Core/Nodes/OptionsNode.cs
@@ -24,8 +24,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 
@@ -43,7 +42,7 @@ namespace Prebuild.Core.Nodes
         {
                 #region Fields
 
-                private static Hashtable m_OptionFields;
+                private static readonly Dictionary<string,FieldInfo> m_OptionFields = new Dictionary<string, FieldInfo>();
 
                 [OptionNode("CompilerDefines")]
                 private string m_CompilerDefines = "";
@@ -495,7 +494,7 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
-                private StringCollection m_FieldsDefined;
+                private readonly List<string> m_FieldsDefined = new List<string>();
 
                 #endregion
 
@@ -508,7 +507,6 @@ namespace Prebuild.Core.Nodes
                 {
                         Type t = typeof(OptionsNode);
             
-                        m_OptionFields = new Hashtable();
                         foreach(FieldInfo f in t.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
                         {
                                 object[] attrs = f.GetCustomAttributes(typeof(OptionNodeAttribute), false);
@@ -522,14 +520,6 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
-                /// <summary>
-                /// Initializes a new instance of the <see cref="OptionsNode"/> class.
-                /// </summary>
-                public OptionsNode()
-                {
-                        m_FieldsDefined = new StringCollection();
-                }
-
                 #endregion
 
                 #region Properties
@@ -547,7 +537,7 @@ namespace Prebuild.Core.Nodes
                                         return null;
                                 }
 
-                                FieldInfo f = (FieldInfo)m_OptionFields[index];
+                                FieldInfo f = m_OptionFields[index];
                                 return f.GetValue(this);
                         }
                 }
@@ -591,7 +581,7 @@ namespace Prebuild.Core.Nodes
                                         return;
                                 }
 
-                                FieldInfo f = (FieldInfo)m_OptionFields[nodeName];
+                                FieldInfo f = m_OptionFields[nodeName];
                                 f.SetValue(this, Helper.TranslateValue(f.FieldType, val));
                                 FlagDefined(f.Name);
                         }
diff --git a/Prebuild/src/Core/Nodes/ProcessNode.cs b/Prebuild/src/Core/Nodes/ProcessNode.cs
index 6bfbe16..8ca8e49 100644
--- a/Prebuild/src/Core/Nodes/ProcessNode.cs
+++ b/Prebuild/src/Core/Nodes/ProcessNode.cs
@@ -24,8 +24,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 04af7a3..fb92b32 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -24,7 +24,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
@@ -90,10 +89,10 @@ namespace Prebuild.Core.Nodes
                 /// .NET 3.5
                 /// </summary>
                 v3_5,
-        /// <summary>
-        /// .NET 4.0
-        /// </summary>
-        v4_0,
+                /// <summary>
+                /// .NET 4.0
+                /// </summary>
+                v4_0,
         }
         /// <summary>
         /// The Node object representing /Prebuild/Solution/Project elements
@@ -121,7 +120,7 @@ namespace Prebuild.Core.Nodes
                 private Guid m_Guid;
         private string m_DebugStartParameters;
 
-        private Hashtable m_Configurations = new Hashtable();
+        private readonly Dictionary<string, ConfigurationNode> m_Configurations = new Dictionary<string, ConfigurationNode>();
         private readonly List<ReferencePathNode> m_ReferencePaths = new List<ReferencePathNode>();
                 private readonly List<ReferenceNode> m_References = new List<ReferenceNode>();
         private readonly List<AuthorNode> m_Authors = new List<AuthorNode>();
@@ -149,7 +148,7 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                            return this.m_Framework;
+                            return m_Framework;
                         }
                 }
                 /// <summary>
@@ -283,7 +282,7 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
-                private bool m_GenerateAssemblyInfoFile = false;
+                private bool m_GenerateAssemblyInfoFile;
                 
                 /// <summary>
                 /// 
@@ -328,11 +327,11 @@ namespace Prebuild.Core.Nodes
                 /// Gets the configurations.
                 /// </summary>
                 /// <value>The configurations.</value>
-                public IList Configurations
+        public List<ConfigurationNode> Configurations
                 {
                         get
                         {
-                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
+                            List<ConfigurationNode> tmp = new List<ConfigurationNode>(ConfigurationsTable.Values);
                 tmp.Sort();
                 return tmp;
                         }
@@ -342,7 +341,7 @@ namespace Prebuild.Core.Nodes
                 /// Gets the configurations table.
                 /// </summary>
                 /// <value>The configurations table.</value>
-                public Hashtable ConfigurationsTable
+                public Dictionary<string, ConfigurationNode> ConfigurationsTable
                 {
                         get
                         {
@@ -420,7 +419,7 @@ namespace Prebuild.Core.Nodes
                                         SolutionNode parent = (SolutionNode)base.Parent;
                                         foreach(ConfigurationNode conf in parent.Configurations)
                                         {
-                                                m_Configurations[conf.Name] = conf.Clone();
+                                                m_Configurations[conf.NameAndPlatform] = (ConfigurationNode) conf.Clone();
                                         }
                                 }
                         }
@@ -455,19 +454,19 @@ namespace Prebuild.Core.Nodes
                         if(String.Compare(conf.Name, "all", true) == 0) //apply changes to all, this may not always be applied first,
                                 //so it *may* override changes to the same properties for configurations defines at the project level
                         {
-                                foreach(ConfigurationNode confNode in this.m_Configurations.Values) 
+                                foreach(ConfigurationNode confNode in m_Configurations.Values) 
                                 {
                                         conf.CopyTo(confNode);//update the config templates defines at the project level with the overrides
                                 }
                         }
-                        if(m_Configurations.ContainsKey(conf.Name))
+                        if(m_Configurations.ContainsKey(conf.NameAndPlatform))
                         {
-                                ConfigurationNode parentConf = (ConfigurationNode)m_Configurations[conf.Name];
+                                ConfigurationNode parentConf = m_Configurations[conf.NameAndPlatform];
                                 conf.CopyTo(parentConf);//update the config templates defines at the project level with the overrides
                         } 
                         else
                         {
-                                m_Configurations[conf.Name] = conf;
+                                m_Configurations[conf.NameAndPlatform] = conf;
                         }
                 }
 
@@ -504,12 +503,12 @@ namespace Prebuild.Core.Nodes
             m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
                     m_DebugStartParameters = Helper.AttributeValue(node, "debugStartParameters", string.Empty);
             
-                        if(m_AssemblyName == null || m_AssemblyName.Length < 1)
+                        if(string.IsNullOrEmpty(m_AssemblyName))
                         {
                                 m_AssemblyName = m_Name;
                         }
 
-                        if(m_RootNamespace == null || m_RootNamespace.Length < 1)
+                        if(string.IsNullOrEmpty(m_RootNamespace))
                         {
                                 m_RootNamespace = m_Name;
                         }
@@ -572,7 +571,7 @@ namespace Prebuild.Core.Nodes
         public int CompareTo(object obj)
         {
             ProjectNode that = (ProjectNode)obj;
-            return this.m_Name.CompareTo(that.m_Name);
+            return m_Name.CompareTo(that.m_Name);
         }
 
                 #endregion
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
index f0543c2..7331cd7 100644
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -24,8 +24,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
index 2a1b8e2..10c0223 100644
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -24,10 +24,8 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Xml;
 
 using Prebuild.Core.Attributes;
@@ -50,18 +48,19 @@ namespace Prebuild.Core.Nodes
                 private string m_Name = "unknown";
                 private string m_Path = "";
                 private string m_FullPath = "";
-                private string m_ActiveConfig = "Debug";
+                private string m_ActiveConfig;
         private string m_Version = "1.0.0";
         
                 private OptionsNode m_Options;
                 private FilesNode m_Files;
-        private readonly Hashtable m_Configurations = new Hashtable();
-        private readonly Hashtable m_Projects = new Hashtable();
-        private readonly Hashtable m_DatabaseProjects = new Hashtable();
+        private readonly ConfigurationNodeCollection m_Configurations = new ConfigurationNodeCollection();
+        private readonly Dictionary<string, ProjectNode> m_Projects = new Dictionary<string, ProjectNode>();
+        private readonly Dictionary<string, DatabaseProjectNode> m_DatabaseProjects = new Dictionary<string, DatabaseProjectNode>();
         private readonly List<ProjectNode> m_ProjectsOrder = new List<ProjectNode>();
-        private readonly Hashtable m_Solutions = new Hashtable();
+        private readonly Dictionary<string, SolutionNode> m_Solutions = new Dictionary<string, SolutionNode>();
+            private CleanupNode m_Cleanup;
 
-                #endregion
+            #endregion
 
                 #region Properties
         public override IDataNode Parent
@@ -77,7 +76,7 @@ namespace Prebuild.Core.Nodes
                     SolutionNode solution = (SolutionNode)value;
                     foreach (ConfigurationNode conf in solution.Configurations)
                     {
-                        m_Configurations[conf.Name] = conf.Clone();
+                        m_Configurations[conf.Name] = (ConfigurationNode) conf.Clone();
                     }
                 }
 
@@ -85,6 +84,18 @@ namespace Prebuild.Core.Nodes
             }
         }
 
+            public CleanupNode Cleanup
+            {
+                get
+                {
+                    return m_Cleanup;
+                }
+            set
+            {
+                m_Cleanup = value;
+            }
+            }
+
         public Guid Guid
         {
             get 
@@ -188,13 +199,13 @@ namespace Prebuild.Core.Nodes
                 /// Gets the configurations.
                 /// </summary>
                 /// <value>The configurations.</value>
-                public ICollection Configurations
+                public ConfigurationNodeCollection Configurations
                 {
                         get
                         {
-                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
-                tmp.Sort();
-                return tmp;
+                                ConfigurationNodeCollection tmp = new ConfigurationNodeCollection();
+                                tmp.AddRange(ConfigurationsTable);
+                                return tmp;
                         }
                 }
 
@@ -202,7 +213,7 @@ namespace Prebuild.Core.Nodes
                 /// Gets the configurations table.
                 /// </summary>
                 /// <value>The configurations table.</value>
-                public Hashtable ConfigurationsTable
+                public ConfigurationNodeCollection ConfigurationsTable
                 {
                         get
                         {
@@ -212,7 +223,7 @@ namespace Prebuild.Core.Nodes
         /// <summary>
         /// Gets the database projects.
         /// </summary>
-        public ICollection DatabaseProjects
+        public ICollection<DatabaseProjectNode> DatabaseProjects
         {
             get
             {
@@ -222,7 +233,7 @@ namespace Prebuild.Core.Nodes
         /// <summary>
         /// Gets the nested solutions.
         /// </summary>
-        public ICollection Solutions
+        public ICollection<SolutionNode> Solutions
         {
             get
             {
@@ -232,22 +243,22 @@ namespace Prebuild.Core.Nodes
         /// <summary>
         /// Gets the nested solutions hash table.
         /// </summary>
-        public Hashtable SolutionsTable
+        public Dictionary<string, SolutionNode> SolutionsTable
         {
             get
             {
-                return this.m_Solutions;
+                return m_Solutions;
             }
         }
                 /// <summary>
                 /// Gets the projects.
                 /// </summary>
                 /// <value>The projects.</value>
-                public ICollection Projects
+                public ICollection<ProjectNode> Projects
                 {
                         get
                         {
-                ArrayList tmp = new ArrayList(m_Projects.Values);
+                List<ProjectNode> tmp = new List<ProjectNode>(m_Projects.Values);
                 tmp.Sort();
                 return tmp;
                         }
@@ -257,7 +268,7 @@ namespace Prebuild.Core.Nodes
                 /// Gets the projects table.
                 /// </summary>
                 /// <value>The projects table.</value>
-                public Hashtable ProjectsTable
+                public Dictionary<string, ProjectNode> ProjectsTable
                 {
                         get
                         {
@@ -325,16 +336,23 @@ namespace Prebuild.Core.Nodes
                                         }
                                         else if(dataNode is ConfigurationNode)
                                         {
-                                                m_Configurations[((ConfigurationNode)dataNode).Name] = dataNode;
+                                                ConfigurationNode configurationNode = (ConfigurationNode) dataNode;
+                                                m_Configurations[configurationNode.NameAndPlatform] = configurationNode;
+
+                                                // If the active configuration is null, then we populate it.
+                                                if (ActiveConfig == null)
+                                                {
+                                                        ActiveConfig = configurationNode.Name;
+                                                }
                                         }
                                         else if(dataNode is ProjectNode)
                                         {
-                                                m_Projects[((ProjectNode)dataNode).Name] = dataNode;
+                                                m_Projects[((ProjectNode)dataNode).Name] = (ProjectNode) dataNode;
                                                 m_ProjectsOrder.Add((ProjectNode)dataNode);
                                         }
                     else if(dataNode is SolutionNode)
                     {
-                        m_Solutions[((SolutionNode)dataNode).Name] = dataNode;
+                        m_Solutions[((SolutionNode)dataNode).Name] = (SolutionNode) dataNode;
                     }
                     else if (dataNode is ProcessNode)
                     {
@@ -343,7 +361,13 @@ namespace Prebuild.Core.Nodes
                     }
                     else if (dataNode is DatabaseProjectNode)
                     {
-                        m_DatabaseProjects[((DatabaseProjectNode)dataNode).Name] = dataNode;
+                        m_DatabaseProjects[((DatabaseProjectNode)dataNode).Name] = (DatabaseProjectNode) dataNode;
+                    }
+                    else if(dataNode is CleanupNode)
+                    {
+                        if(m_Cleanup != null)
+                            throw new WarningException("There can only be one Cleanup node.");
+                        m_Cleanup = (CleanupNode)dataNode;
                     }
                                 }
                         }