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.

42 files changed, 2048 insertions, 1753 deletions

diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
index 95ef04e..67051d5 100644
--- a/Prebuild/src/Core/Kernel.cs
+++ b/Prebuild/src/Core/Kernel.cs
@@ -36,21 +36,17 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 #endregion
 
+#define NO_VALIDATE
+
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Specialized;
 using System.IO;
 using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
-using System.Text;
-
 using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
 using Prebuild.Core.Nodes;
-using Prebuild.Core.Parse;
 using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core 
@@ -77,7 +73,7 @@ namespace Prebuild.Core
                 /// <summary>
                 /// This must match the version of the schema that is embeeded
                 /// </summary>
-                private const string m_SchemaVersion = "1.7";
+                private const string m_SchemaVersion = "1.9";
                 private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
                 private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
                 bool disposed;
@@ -87,9 +83,9 @@ namespace Prebuild.Core
                 private Log m_Log;
                 private CurrentDirectory m_CurrentWorkingDirectory;
                 private XmlSchemaCollection m_Schemas;
-        
-                private Hashtable m_Targets;
-                private Hashtable m_Nodes;
+
+        private readonly Dictionary<string, ITarget> m_Targets = new Dictionary<string, ITarget>();
+        private readonly Dictionary<string, NodeEntry> m_Nodes = new Dictionary<string, NodeEntry>();
 
             readonly List<SolutionNode> m_Solutions = new List<SolutionNode>();        
                 string m_Target;
@@ -163,7 +159,7 @@ namespace Prebuild.Core
                 /// Gets the targets.
                 /// </summary>
                 /// <value>The targets.</value>
-                public Hashtable Targets
+                public Dictionary<string, ITarget> Targets
                 {
                         get
                         {
@@ -259,7 +255,7 @@ namespace Prebuild.Core
 
                 private void LoadSchema()
                 {
-                        Assembly assembly = this.GetType().Assembly;
+                        Assembly assembly = GetType().Assembly;
                         Stream stream = assembly.GetManifestResourceStream("Prebuild.data." + m_Schema);
                         if(stream == null) 
                         {
@@ -319,23 +315,24 @@ namespace Prebuild.Core
 
                 private void LogBanner()
                 {
-                  m_Log.Write("Prebuild v" + this.Version);
-                  m_Log.Write("Copyright (c) 2004-2008");
-                  m_Log.Write("Matthew Holmes (matthew@wildfiregames.com),");
-                  m_Log.Write("Dan Moorehead (dan05a@gmail.com),");
-                  m_Log.Write("David Hudson (jendave@yahoo.com),");
-                  m_Log.Write("Rob Loach (http://www.robloach.net),");
-                  m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),");
-
-                  m_Log.Write("See 'prebuild /usage' for help");
-                  m_Log.Write();
+            m_Log.Write("Prebuild v" + Version);
+            m_Log.Write("Copyright (c) 2004-2010");
+            m_Log.Write("Matthew Holmes (matthew@wildfiregames.com),");
+            m_Log.Write("Dan Moorehead (dan05a@gmail.com),");
+            m_Log.Write("David Hudson (jendave@yahoo.com),");
+            m_Log.Write("Rob Loach (http://www.robloach.net),");
+            m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),");
+            m_Log.Write("John Hurliman (john.hurliman@intel.com),");
+
+            m_Log.Write("See 'prebuild /usage' for help");
+            m_Log.Write();
                 }
 
 
 
         private void ProcessFile(string file)
         {
-            ProcessFile(file, this.m_Solutions);
+            ProcessFile(file, m_Solutions);
         }
 
         public void ProcessFile(ProcessNode node, SolutionNode parent)
@@ -381,12 +378,12 @@ namespace Prebuild.Core
                 Core.Parse.Preprocessor pre = new Core.Parse.Preprocessor();
 
                 //register command line arguments as XML variables
-                IDictionaryEnumerator dict = m_CommandLine.GetEnumerator();
+                            IEnumerator<KeyValuePair<string, string>> dict = m_CommandLine.GetEnumerator();
                 while (dict.MoveNext())
                 {
-                    string name = dict.Key.ToString().Trim();
+                    string name = dict.Current.Key.Trim();
                     if (name.Length > 0)
-                        pre.RegisterVariable(name, dict.Value.ToString());
+                        pre.RegisterVariable(name, dict.Current.Value);
                 }
 
                                 string xml = pre.Process(reader);//remove script and evaulate pre-proccessing to get schema-conforming XML
@@ -422,6 +419,10 @@ namespace Prebuild.Core
                                 m_CurrentDoc = new XmlDocument();
                                 try
                                 {
+#if NO_VALIDATE
+                                        XmlReader validator = XmlReader.Create(new StringReader(xml));
+                                        m_CurrentDoc.Load(validator);
+#else
                                         XmlValidatingReader validator = new XmlValidatingReader(new XmlTextReader(new StringReader(xml)));
 
                                         //validate while reading from string into XmlDocument DOM structure in memory
@@ -430,6 +431,7 @@ namespace Prebuild.Core
                                                 validator.Schemas.Add(schema);
                                         }
                                         m_CurrentDoc.Load(validator);
+#endif
                                 } 
                                 catch(XmlException e) 
                                 {
@@ -541,7 +543,7 @@ namespace Prebuild.Core
                                 return null;
                         }
 
-                        NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
+                        NodeEntry ne = m_Nodes[node.Name];
                         return ne.Type;
                 }
 
@@ -578,11 +580,11 @@ namespace Prebuild.Core
                                 {
                                         if(!m_Nodes.ContainsKey(node.Name))
                                         {
-                                                //throw new XmlException("Unknown XML node: " + node.Name);
+                                                Console.WriteLine("WARNING: Unknown XML node: " + node.Name);
                                                 return null;
                                         }
 
-                                        NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
+                                        NodeEntry ne = m_Nodes[node.Name];
                                         Type type = ne.Type;
                                         //DataNodeAttribute dna = ne.Attribute;
 
@@ -624,10 +626,8 @@ namespace Prebuild.Core
                 /// <param name="args">The args.</param>
                 public void Initialize(LogTargets target, string[] args)
                 {
-                        m_Targets = new Hashtable();
-                        CacheTargets(this.GetType().Assembly);
-                        m_Nodes = new Hashtable();
-                        CacheNodeTypes(this.GetType().Assembly);
+                        CacheTargets(GetType().Assembly);
+                        CacheNodeTypes(GetType().Assembly);
                         CacheVersion();
 
                         m_CommandLine = new CommandLineCollection(args);
@@ -750,11 +750,11 @@ namespace Prebuild.Core
                         }
                         else
                         {
-                                if (!m_Targets.Contains(target)) {
+                                if (!m_Targets.ContainsKey(target)) {
                                         m_Log.Write(LogType.Error, "Unknown Target \"{0}\"", target);
                                         return;
                                 }
-                                ITarget targ = (ITarget)m_Targets[target];
+                                ITarget targ = m_Targets[target];
 
                                 if(clean)
                                 {
@@ -793,18 +793,19 @@ namespace Prebuild.Core
                 /// </remarks>
                 protected virtual void Dispose(bool disposing)
                 {
-                        if (!this.disposed)
+                        if (!disposed)
                         {
                                 if (disposing)
                                 {
-                                        if (this.m_Log != null)
+                    GC.SuppressFinalize(this);
+                                        if (m_Log != null)
                                         {
-                                                this.m_Log.Close();
-                                                this.m_Log = null;
+                                                m_Log.Close();
+                                                m_Log = null;
                                         }
                                 }
                         }
-                        this.disposed = true;
+                        disposed = true;
                 }
 
                 /// <summary>
@@ -812,7 +813,7 @@ namespace Prebuild.Core
                 /// </summary>
                 ~Kernel()
                 {
-                        this.Dispose(false);
+                        Dispose(false);
                 }
                 
                 /// <summary>
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;
                     }
                                 }
                         }
diff --git a/Prebuild/src/Core/Parse/Preprocessor.cs b/Prebuild/src/Core/Parse/Preprocessor.cs
index b2306e4..0648fad 100644
--- a/Prebuild/src/Core/Parse/Preprocessor.cs
+++ b/Prebuild/src/Core/Parse/Preprocessor.cs
@@ -24,7 +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.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
@@ -83,9 +83,9 @@ namespace Prebuild.Core.Parse
 
                 #region Fields
 
-                XmlDocument m_OutDoc;
-                Stack m_IfStack;
-                Hashtable m_Variables;
+            readonly XmlDocument m_OutDoc = new XmlDocument();
+            readonly Stack<IfContext> m_IfStack = new Stack<IfContext>();
+            readonly Dictionary<string, object> m_Variables = new Dictionary<string, object>();
 
                 #endregion
 
@@ -96,10 +96,6 @@ namespace Prebuild.Core.Parse
                 /// </summary>
                 public Preprocessor()
                 {
-                        m_OutDoc = new XmlDocument();
-                        m_IfStack = new Stack();
-                        m_Variables = new Hashtable();
-
                         RegisterVariable("OS", GetOS());
                         RegisterVariable("RuntimeVersion", Environment.Version.Major);
                         RegisterVariable("RuntimeMajor", Environment.Version.Major);
@@ -237,11 +233,10 @@ namespace Prebuild.Core.Parse
                         string str = "";
                         OperatorSymbol oper = OperatorSymbol.None;
                         bool inStr = false;
-                        char c;
-                        
-                        for(int i = 0; i < exp.Length; i++)
+
+                    for(int i = 0; i < exp.Length; i++)
                         {
-                                c = exp[i];
+                                char c = exp[i];
                                 if(Char.IsWhiteSpace(c))
                                 {
                                         continue;
@@ -326,16 +321,16 @@ namespace Prebuild.Core.Parse
                         {
                                 throw new WarningException("Expected operator in expression");
                         }
-                        else if(id.Length < 1)
-                        {
-                                throw new WarningException("Expected identifier in expression");
-                        }
-                        else if(str.Length < 1)
-                        {
-                                throw new WarningException("Expected value in expression");
-                        }
-
-                        bool ret = false;
+                    if(id.Length < 1)
+                    {
+                        throw new WarningException("Expected identifier in expression");
+                    }
+                    if(str.Length < 1)
+                    {
+                        throw new WarningException("Expected value in expression");
+                    }
+
+                    bool ret;
                         try
                         {
                                 object val = m_Variables[id.ToLower()];
@@ -344,19 +339,17 @@ namespace Prebuild.Core.Parse
                                         throw new WarningException("Unknown identifier '{0}'", id);
                                 }
 
-                                int numVal, numVal2;
-                                string strVal, strVal2;
-                                Type t = val.GetType();
+                            Type t = val.GetType();
                                 if(t.IsAssignableFrom(typeof(int)))
                                 {
-                                        numVal = (int)val;
-                                        numVal2 = Int32.Parse(str);
+                                        int numVal = (int)val;
+                                        int numVal2 = Int32.Parse(str);
                                         ret = CompareNum(oper, numVal, numVal2);
                                 }
                                 else
                                 {
-                                        strVal = val.ToString();
-                                        strVal2 = str;
+                                        string strVal = val.ToString();
+                                        string strVal2 = str;
                                         ret = CompareStr(oper, strVal, strVal2);
                                 }
                         }
@@ -369,6 +362,70 @@ namespace Prebuild.Core.Parse
                         return ret;
                 }
 
+        /// <summary>
+        /// Taken from current Prebuild included in OpenSim 0.7.x
+        /// </summary>
+        /// <param name="readerStack">
+        /// A <see cref="Stack<XmlReader>"/>
+        /// </param>
+        /// <param name="include">
+        /// A <see cref="System.String"/>
+        /// </param>
+        private static void WildCardInclude (Stack<XmlReader> readerStack, string include)
+        {
+            if (!include.Contains ("*")) {
+                return;
+            }
+            
+            // Console.WriteLine("Processing {0}", include);
+            
+            // Break up the include into pre and post wildcard sections
+            string preWildcard = include.Substring (0, include.IndexOf ("*"));
+            string postWildcard = include.Substring (include.IndexOf ("*") + 2);
+            
+            // If preWildcard is a directory, recurse
+            if (Directory.Exists (preWildcard)) {
+                string[] directories = Directory.GetDirectories (preWildcard);
+                Array.Sort (directories);
+                Array.Reverse (directories);
+                foreach (string dirPath in directories) {
+                    //Console.WriteLine ("Scanning : {0}", dirPath);
+                    
+                    string includeFile = Path.Combine (dirPath, postWildcard);
+                    if (includeFile.Contains ("*")) {
+                        // postWildcard included another wildcard, recurse.
+                        WildCardInclude (readerStack, includeFile);
+                    } else {
+                        FileInfo file = new FileInfo (includeFile);
+                        if (file.Exists) {
+                            //Console.WriteLine ("Including File: {0}", includeFile);
+                            XmlReader newReader = new XmlTextReader (file.Open (FileMode.Open, FileAccess.Read, FileShare.Read));
+                            readerStack.Push (newReader);
+                        }
+                    }
+                }
+            } else {
+                // preWildcard is not a path to a directory, so the wildcard is in the filename
+                string searchFilename = Path.GetFileName (preWildcard.Substring (preWildcard.IndexOf ("/") + 1) + "*" + postWildcard);
+                Console.WriteLine ("searchFilename: {0}", searchFilename);
+                
+                string searchDirectory = Path.GetDirectoryName (preWildcard);
+                Console.WriteLine ("searchDirectory: {0}", searchDirectory);
+                
+                string[] files = Directory.GetFiles (searchDirectory, searchFilename);
+                Array.Sort (files);
+                Array.Reverse (files);
+                foreach (string includeFile in files) {
+                    FileInfo file = new FileInfo (includeFile);
+                    if (file.Exists) {
+                        // Console.WriteLine ("Including File: {0}", includeFile);
+                        XmlReader newReader = new XmlTextReader (file.Open (FileMode.Open, FileAccess.Read, FileShare.Read));
+                        readerStack.Push (newReader);
+                    }
+                }
+            }
+        }
+
                 #endregion
 
                 #region Public Methods
@@ -392,7 +449,7 @@ namespace Prebuild.Core.Parse
                 /// Performs validation on the xml source as well as evaluates conditional and flow expresions
                 /// </summary>
                 /// <exception cref="ArgumentException">For invalid use of conditional expressions or for invalid XML syntax.  If a XmlValidatingReader is passed, then will also throw exceptions for non-schema-conforming xml</exception>
-                /// <param name="reader"></param>
+        /// <param name="initialReader"></param>
                 /// <returns>the output xml </returns>
                 public string Process(XmlReader initialReader)
                 {
@@ -411,13 +468,13 @@ namespace Prebuild.Core.Parse
                         // readers which lets the <?include?> operation add more
                         // readers to generate a multi-file parser and not require
                         // XML fragments that a recursive version would use.
-                        Stack readerStack = new Stack();
+                        Stack<XmlReader> readerStack = new Stack<XmlReader>();
                         readerStack.Push(initialReader);
                         
                         while(readerStack.Count > 0)
                         {
                                 // Pop off the next reader.
-                                XmlReader reader = (XmlReader) readerStack.Pop();
+                                XmlReader reader = readerStack.Pop();
 
                                 // Process through this XML reader until it is
                                 // completed (or it is replaced by the include
@@ -437,7 +494,7 @@ namespace Prebuild.Core.Parse
                                                         case "include":
                                                                 // use regular expressions to parse out the attributes.
                                                                 MatchCollection matches = includeFileRegex.Matches(reader.Value);
-                                                                
+
                                                                 // make sure there is only one file attribute.
                                                                 if(matches.Count > 1)
                                                                 {
@@ -448,38 +505,37 @@ namespace Prebuild.Core.Parse
                                                                 {
                                                                         throw new WarningException("An <?include ?> node was found, but it did not specify the file attribute.");
                                                                 }
-                                                                
-                                // Push current reader back onto the stack.
-                                readerStack.Push(reader);
-
-                                                                // Pull the file out from the regex and make sure it is a valid file before using it.
-                                                                string filename = matches[0].Groups[1].Value;
 
-                                filename = String.Join(Path.DirectorySeparatorChar.ToString(), filename.Split(new char[] { '/', '\\' }));
-
-                                if (!filename.Contains("*"))
-                                {
-                                    FileInfo includeFile = new FileInfo(filename);
-
-                                    if (!includeFile.Exists)
-                                    {
-                                        throw new WarningException("Cannot include file: " + includeFile.FullName);
+                                // ***** Adding for wildcard handling
+                                // Push current reader back onto the stack.
+                                readerStack.Push (reader);
+                                
+                                // Pull the file out from the regex and make sure it is a valid file before using it.
+                                string filename = matches[0].Groups[1].Value;
+                                
+                                filename = String.Join (Path.DirectorySeparatorChar.ToString (), filename.Split (new char[] { '/', '\\' }));
+                                
+                                if (!filename.Contains ("*")) {
+                                
+                                    FileInfo includeFile = new FileInfo (filename);
+                                    if (!includeFile.Exists) {
+                                        throw new WarningException ("Cannot include file: " + includeFile.FullName);
                                     }
-
-                                    // Create a new reader object for this file, and push it onto the stack
-                                    XmlReader newReader = new XmlTextReader(includeFile.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
-                                    readerStack.Push(newReader);
-                                }
-                                else
-                                {
-                                    WildCardInclude(readerStack, filename);
+                                
+                                    // Create a new reader object for this file. Then put the old reader back on the stack and start
+                                    // processing using this new XML reader.
+                                
+                                    XmlReader newReader = new XmlTextReader (includeFile.Open (FileMode.Open, FileAccess.Read, FileShare.Read));
+                                    reader = newReader;
+                                    readerStack.Push (reader);
+                                
+                                } else {
+                                    WildCardInclude (readerStack, filename);
                                 }
-
-                                // continue reading with whatever reader is on the top of the stack
-                                reader = (XmlReader)readerStack.Pop();
+                                
+                                reader = (XmlReader)readerStack.Pop ();
                                 ignore = true;
-
-                                                                break;
+                                break;
 
                                                         case "if":
                                                                 m_IfStack.Push(context);
@@ -492,12 +548,12 @@ namespace Prebuild.Core.Parse
                                                                 {
                                                                         throw new WarningException("Unexpected 'elseif' outside of 'if'");
                                                                 }
-                                                                else if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                                {
-                                                                        throw new WarningException("Unexpected 'elseif' outside of 'if'");
-                                                                }
+                                                        if(context.State != IfState.If && context.State != IfState.ElseIf)
+                                                        {
+                                                            throw new WarningException("Unexpected 'elseif' outside of 'if'");
+                                                        }
 
-                                                                context.State = IfState.ElseIf;
+                                                        context.State = IfState.ElseIf;
                                                                 if(!context.EverKept)
                                                                 {
                                                                         context.Keep = ParseExpression(reader.Value);
@@ -515,12 +571,12 @@ namespace Prebuild.Core.Parse
                                                                 {
                                                                         throw new WarningException("Unexpected 'else' outside of 'if'");
                                                                 }
-                                                                else if(context.State != IfState.If && context.State != IfState.ElseIf)
-                                                                {
-                                                                        throw new WarningException("Unexpected 'else' outside of 'if'");
-                                                                }
+                                                        if(context.State != IfState.If && context.State != IfState.ElseIf)
+                                                        {
+                                                            throw new WarningException("Unexpected 'else' outside of 'if'");
+                                                        }
 
-                                                                context.State = IfState.Else;
+                                                        context.State = IfState.Else;
                                                                 context.Keep = !context.EverKept;
                                                                 ignore = true;
                                                                 break;
@@ -531,7 +587,7 @@ namespace Prebuild.Core.Parse
                                                                         throw new WarningException("Unexpected 'endif' outside of 'if'");
                                                                 }
 
-                                                                context = (IfContext)m_IfStack.Pop();
+                                                                context = m_IfStack.Pop();
                                                                 ignore = true;
                                                                 break;
                                                 }
@@ -591,73 +647,6 @@ namespace Prebuild.Core.Parse
                         return xmlText.ToString();
                 }
 
-        private static void WildCardInclude(Stack readerStack, string include)
-        {
-            if (!include.Contains("*"))
-            {
-                return;
-            }
-
-//            Console.WriteLine("Processing {0}", include);
-
-            // Break up the include into pre and post wildcard sections
-            string preWildcard = include.Substring(0, include.IndexOf("*"));
-            string postWildcard = include.Substring(include.IndexOf("*") + 2);
-
-            // If preWildcard is a directory, recurse
-            if (Directory.Exists(preWildcard))
-            {
-                string[] directories = Directory.GetDirectories(preWildcard);
-                Array.Sort(directories);
-                Array.Reverse(directories);
-                foreach (string dirPath in directories )
-                {
-                    Console.WriteLine("Scanning : {0}", dirPath);
-
-                    string includeFile = Path.Combine(dirPath, postWildcard);
-                    if (includeFile.Contains("*"))
-                    {
-                        // postWildcard included another wildcard, recurse.
-                        WildCardInclude(readerStack, includeFile);
-                    }
-                    else
-                    {
-                        FileInfo file = new FileInfo(includeFile);
-                        if (file.Exists)
-                        {
-                            Console.WriteLine("Including File: {0}", includeFile);
-                            XmlReader newReader = new XmlTextReader(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
-                            readerStack.Push(newReader);
-                        }
-                    }
-                }
-            } 
-            else 
-            {
-                // preWildcard is not a path to a directory, so the wildcard is in the filename
-                string searchFilename = Path.GetFileName(preWildcard.Substring(preWildcard.IndexOf("/") + 1) + "*" + postWildcard);
-                // Console.WriteLine("searchFilename: {0}", searchFilename);
-
-                string searchDirectory = Path.GetDirectoryName(preWildcard);
-                // Console.WriteLine("searchDirectory: {0}", searchDirectory);
-
-                string[] files = Directory.GetFiles(searchDirectory, searchFilename);
-                Array.Sort(files);
-                Array.Reverse(files);
-                foreach (string includeFile in files)
-                {
-                    FileInfo file = new FileInfo(includeFile);
-                    if (file.Exists)
-                    {
-                        Console.WriteLine("Including File: {0}", includeFile);
-                        XmlReader newReader = new XmlTextReader(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
-                        readerStack.Push(newReader);
-                    }
-                }
-            }
-
-        }
-
                 #endregion
         }
 }
diff --git a/Prebuild/src/Core/Targets/.NAntTarget.cs.swp b/Prebuild/src/Core/Targets/.NAntTarget.cs.swp
new file mode 100644
index 0000000..afec61c
--- /dev/null
+++ b/Prebuild/src/Core/Targets/.NAntTarget.cs.swp
diff --git a/Prebuild/src/Core/Targets/AutotoolsTarget.cs b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
index 5dcbb38..485e4dd 100644
--- a/Prebuild/src/Core/Targets/AutotoolsTarget.cs
+++ b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
@@ -66,9 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #endregion
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -81,7 +79,6 @@ using System.Diagnostics;
 using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
 using Prebuild.Core.Nodes;
-using Prebuild.Core.Parse;
 using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Targets
@@ -170,16 +167,16 @@ namespace Prebuild.Core.Targets
         XmlDocument autotoolsDoc;
         XmlUrlResolver xr;
         System.Security.Policy.Evidence e;
-        Hashtable assemblyPathToPackage = new Hashtable();
-        Hashtable assemblyFullNameToPath = new Hashtable();
-        Hashtable packagesHash = new Hashtable();
+        readonly Dictionary<string, SystemPackage> assemblyPathToPackage = new Dictionary<string, SystemPackage>();
+        readonly Dictionary<string, string> assemblyFullNameToPath = new Dictionary<string, string>();
+        readonly Dictionary<string, SystemPackage> packagesHash = new Dictionary<string, SystemPackage>();
         readonly List<SystemPackage> packages = new List<SystemPackage>();
 
         #endregion
 
         #region Private Methods
 
-        private void mkdirDashP(string dirName)
+        private static void mkdirDashP(string dirName)
         {
             DirectoryInfo di = new DirectoryInfo(dirName);
             if (di.Exists)
@@ -193,7 +190,7 @@ namespace Prebuild.Core.Targets
             di.Create();
         }
 
-        private void chkMkDir(string dirName)
+        private static void chkMkDir(string dirName)
         {
             System.IO.DirectoryInfo di =
                 new System.IO.DirectoryInfo(dirName);
@@ -222,13 +219,12 @@ namespace Prebuild.Core.Targets
                 (m_Kernel.CurrentDoc, argList, templateWriter, xr);
         }
 
-        string NormalizeAsmName(string name)
+        static string NormalizeAsmName(string name)
         {
             int i = name.IndexOf(", PublicKeyToken=null");
             if (i != -1)
                 return name.Substring(0, i).Trim();
-            else
-                return name;
+            return name;
         }
 
         private void AddAssembly(string assemblyfile, SystemPackage package)
@@ -247,7 +243,7 @@ namespace Prebuild.Core.Targets
             }
         }
 
-        private List<string> GetAssembliesWithLibInfo(string line, string file)
+        private static List<string> GetAssembliesWithLibInfo(string line, string file)
         {
             List<string> references = new List<string>();
             List<string> libdirs = new List<string>();
@@ -278,7 +274,7 @@ namespace Prebuild.Core.Targets
             return retval;
         }
 
-        private List<string> GetAssembliesWithoutLibInfo(string line, string file)
+        private static List<string> GetAssembliesWithoutLibInfo(string line, string file)
         {
             List<string> references = new List<string>();
             foreach (string reference in line.Split(' '))
@@ -292,7 +288,7 @@ namespace Prebuild.Core.Targets
             return references;
         }
 
-        private string ProcessPiece(string piece, string pcfile)
+        private static string ProcessPiece(string piece, string pcfile)
         {
             int start = piece.IndexOf("${");
             if (start == -1)
@@ -307,7 +303,7 @@ namespace Prebuild.Core.Targets
             return ProcessPiece(piece.Replace("${" + variable + "}", interp), pcfile);
         }
 
-        private string GetVariableFromPkgConfig(string var, string pcfile)
+        private static string GetVariableFromPkgConfig(string var, string pcfile)
         {
             ProcessStartInfo psi = new ProcessStartInfo("pkg-config");
             psi.RedirectStandardOutput = true;
@@ -327,7 +323,7 @@ namespace Prebuild.Core.Targets
         {
             // Don't register the package twice
             string pname = Path.GetFileNameWithoutExtension(pcfile);
-            if (packagesHash.Contains(pname))
+            if (packagesHash.ContainsKey(pname))
                 return;
 
             List<string> fullassemblies = null;
@@ -507,158 +503,6 @@ namespace Prebuild.Core.Targets
               WriteProject(solution, project);
             }
         }
-        private static string PrependPath(string path)
-        {
-            string tmpPath = Helper.NormalizePath(path, '/');
-            Regex regex = new Regex(@"(\w):/(\w+)");
-            Match match = regex.Match(tmpPath);
-            if (match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
-            {
-                tmpPath = Helper.NormalizePath(tmpPath);
-            }
-            else
-            {
-                tmpPath = Helper.NormalizePath("./" + tmpPath);
-            }
-
-            return tmpPath;
-        }
-
-        private static string BuildReference(SolutionNode solution,
-                                             ReferenceNode refr)
-        {
-            string ret = "";
-            if (solution.ProjectsTable.ContainsKey(refr.Name))
-            {
-                ProjectNode project =
-                  (ProjectNode)solution.ProjectsTable[refr.Name];
-                string fileRef = FindFileReference(refr.Name, project);
-                string finalPath =
-                  Helper.NormalizePath(Helper.MakeFilePath(project.FullPath +
-                                                           "/$(BUILD_DIR)/$(CONFIG)/",
-                                                           refr.Name, "dll"),
-                                       '/');
-                ret += finalPath;
-                return ret;
-            }
-            else
-            {
-                ProjectNode project = (ProjectNode)refr.Parent;
-                string fileRef = FindFileReference(refr.Name, project);
-
-                if (refr.Path != null || fileRef != null)
-                {
-                  string finalPath = ((refr.Path != null) ?
-                                      Helper.NormalizePath(refr.Path + "/" +
-                                                           refr.Name + ".dll",
-                                                           '/') :
-                                      fileRef
-                                      );
-                    ret += Path.Combine(project.Path, finalPath);
-                    return ret;
-                }
-
-                try
-                {
-                    //Assembly assem = Assembly.Load(refr.Name);
-                    //if (assem != null)
-                    //{
-                    //    int index = refr.Name.IndexOf(",");
-                    //    if ( index > 0)
-                    //    {
-                    //        ret += assem.Location;
-                    //        //Console.WriteLine("Location1: " + assem.Location);
-                    //    }
-                    //    else
-                    //    {
-                    //        ret += (refr.Name + ".dll");
-                    //        //Console.WriteLine("Location2: " + assem.Location);
-                    //    }
-                    //}
-                    //else
-                    //{
-                    int index = refr.Name.IndexOf(",");
-                    if (index > 0)
-                    {
-                        ret += refr.Name.Substring(0, index) + ".dll";
-                        //Console.WriteLine("Location3: " + assem.Location);
-                    }
-                    else
-                    {
-                        ret += (refr.Name + ".dll");
-                        //Console.WriteLine("Location4: " + assem.Location);
-                    }
-                    //}
-                }
-                catch (System.NullReferenceException e)
-                {
-                    e.ToString();
-                    int index = refr.Name.IndexOf(",");
-                    if (index > 0)
-                    {
-                        ret += refr.Name.Substring(0, index) + ".dll";
-                        //Console.WriteLine("Location5: " + assem.Location);
-                    }
-                    else
-                    {
-                        ret += (refr.Name + ".dll");
-                        //Console.WriteLine("Location6: " + assem.Location);
-                    }
-                }
-            }
-            return ret;
-        }
-
-        private static string BuildReferencePath(SolutionNode solution,
-                                                 ReferenceNode refr)
-        {
-            string ret = "";
-            if (solution.ProjectsTable.ContainsKey(refr.Name))
-            {
-              ProjectNode project =
-                (ProjectNode)solution.ProjectsTable[refr.Name];
-              string finalPath =
-                Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath +
-                                                              "/${build.dir}/"),
-                                     '/');
-              ret += finalPath;
-              return ret;
-            }
-            else
-            {
-              ProjectNode project = (ProjectNode)refr.Parent;
-              string fileRef = FindFileReference(refr.Name, project);
-
-              if (refr.Path != null || fileRef != null)
-                {
-                  string finalPath = ((refr.Path != null) ?
-                                      Helper.NormalizePath(refr.Path, '/') :
-                                      fileRef
-                                      );
-                  ret += finalPath;
-                  return ret;
-                }
-
-              try
-                {
-                  Assembly assem = Assembly.Load(refr.Name);
-                  if (assem != null)
-                    {
-                      ret += "";
-                    }
-                  else
-                    {
-                      ret += "";
-                    }
-                }
-              catch (System.NullReferenceException e)
-                {
-                  e.ToString();
-                  ret += "";
-                }
-            }
-            return ret;
-        }
 
         private static string FindFileReference(string refName,
                                                 ProjectNode project)
@@ -831,7 +675,7 @@ namespace Prebuild.Core.Targets
                     }
                     catch 
                     {
-                        Console.WriteLine("Error! '{0}'", e.ToString());
+                        Console.WriteLine("Error! '{0}'", e);
                     }
                    
                 }
@@ -865,7 +709,7 @@ namespace Prebuild.Core.Targets
             // Set up references
             for (int refNum = 0; refNum < project.References.Count; refNum++)
             {
-                ReferenceNode refr = (ReferenceNode)project.References[refNum];
+                ReferenceNode refr = project.References[refNum];
                 Assembly refAssembly = Assembly.LoadWithPartialName(refr.Name);
 
                 /* Determine which pkg-config (.pc) file refers to
@@ -873,25 +717,28 @@ namespace Prebuild.Core.Targets
 
                 SystemPackage package = null;
 
-                if (packagesHash.Contains(refr.Name)){
-                  package = (SystemPackage)packagesHash[refr.Name];
-
-                }else{
-                  string assemblyFullName = string.Empty;
-                  if (refAssembly != null)
-                    assemblyFullName = refAssembly.FullName;
-
-                  string assemblyFileName = string.Empty;
-                  if (assemblyFullName != string.Empty &&
-                      assemblyFullNameToPath.Contains(assemblyFullName)
-                      )
-                    assemblyFileName =
-                      (string)assemblyFullNameToPath[assemblyFullName];
+                if (packagesHash.ContainsKey(refr.Name))
+                {
+                  package = packagesHash[refr.Name];
 
-                  if (assemblyFileName != string.Empty &&
-                      assemblyPathToPackage.Contains(assemblyFileName)
-                      )
-                    package = (SystemPackage)assemblyPathToPackage[assemblyFileName];
+                }
+                else
+                {
+                    string assemblyFullName = string.Empty;
+                    if (refAssembly != null)
+                        assemblyFullName = refAssembly.FullName;
+
+                    string assemblyFileName = string.Empty;
+                    if (assemblyFullName != string.Empty &&
+                        assemblyFullNameToPath.ContainsKey(assemblyFullName)
+                        )
+                        assemblyFileName =
+                          assemblyFullNameToPath[assemblyFullName];
+
+                    if (assemblyFileName != string.Empty &&
+                        assemblyPathToPackage.ContainsKey(assemblyFileName)
+                        )
+                        package = assemblyPathToPackage[assemblyFileName];
 
                 }
 
@@ -958,7 +805,7 @@ namespace Prebuild.Core.Targets
                          */
 
                         ProjectNode sourcePrj =
-                          ((ProjectNode)(solution.ProjectsTable[refr.Name]));
+                          ((solution.ProjectsTable[refr.Name]));
 
                         string target =
                           String.Format("{0}:\n" +
@@ -1067,564 +914,6 @@ namespace Prebuild.Core.Targets
                 transformToFile(Path.Combine(projectDir, project.Name.ToLower() + ".in"), argList, "/Autotools/ProjectWrapperScriptIn");
         }
 
-        private void WriteProjectOld(SolutionNode solution, ProjectNode project)
-        {
-            string projFile = Helper.MakeFilePath(project.FullPath, "Include", "am");
-            StreamWriter ss = new StreamWriter(projFile);
-            ss.NewLine = "\n";
-
-            m_Kernel.CurrentWorkingDirectory.Push();
-            Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
-
-            using (ss)
-            {
-                ss.WriteLine(Helper.AssemblyFullName(project.AssemblyName, project.Type) + ":");
-                ss.WriteLine("\tmkdir -p " + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/");
-                foreach (string file in project.Files)
-                {
-                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                    {
-                        ss.Write("\tresgen ");
-                        ss.Write(Helper.NormalizePath(Path.Combine(project.Path, file.Substring(0, file.LastIndexOf('.')) + ".resx "), '/'));
-                        if (project.Files.GetResourceName(file) != "")
-                        {
-                            ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/'));
-                        }
-                        else
-                        {
-                            ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/'));
-                        }
-                    }
-                }
-                ss.WriteLine("\t$(CSC)\t/out:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " \\");
-                ss.WriteLine("\t\t/target:" + project.Type.ToString().ToLower() + " \\");
-                if (project.References.Count > 0)
-                {
-                    ss.Write("\t\t/reference:");
-                    bool firstref = true;
-                    foreach (ReferenceNode refr in project.References)
-                    {
-                        if (firstref)
-                        {
-                            firstref = false;
-                        }
-                        else
-                        {
-                            ss.Write(",");
-                        }
-                        ss.Write("{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(solution.FullPath, BuildReference(solution, refr)), '/'));
-                    }
-                    ss.WriteLine(" \\");
-                }
-                //ss.WriteLine("\t\tProperties/AssemblyInfo.cs \\");
-
-                foreach (string file in project.Files)
-                {
-                    switch (project.Files.GetBuildAction(file))
-                    {
-                        case BuildAction.EmbeddedResource:
-                            ss.Write("\t\t/resource:");
-                            ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, file), '/') + " \\");
-                            break;
-                        default:
-                            if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
-                            {
-                                ss.Write("\t\t/resource:");
-                                if (project.Files.GetResourceName(file) != "")
-                                {
-                                    ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/') + "," + project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources" + " \\");
-                                }
-                                else
-                                {
-                                    ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/') + "," + project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources" + " \\");
-                                }
-                            }
-                            break;
-                    }
-                }
-
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (conf.Options.KeyFile != "")
-                    {
-                        ss.WriteLine("\t\t/keyfile:" + Helper.NormalizePath(Path.Combine(project.Path, conf.Options.KeyFile), '/') + " \\");
-                        break;
-                    }
-                }
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (conf.Options.AllowUnsafe)
-                    {
-                        ss.WriteLine("\t\t/unsafe \\");
-                        break;
-                    }
-                }
-                if (project.AppIcon != "")
-                {
-                    ss.WriteLine("\t\t/win32icon:" + Helper.NormalizePath(Path.Combine(project.Path, project.AppIcon), '/') + " \\");
-                }
-
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    ss.WriteLine("\t\t/define:{0}", conf.Options.CompilerDefines.Replace(';', ',') + " \\");
-                    break;
-                }
-
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (GetXmlDocFile(project, conf) != "")
-                    {
-                        ss.WriteLine("\t\t/doc:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + project.Name + ".xml \\");
-                        break;
-                    }
-                }
-                foreach (string file in project.Files)
-                {
-                    switch (project.Files.GetBuildAction(file))
-                    {
-                        case BuildAction.Compile:
-                            ss.WriteLine("\t\t\\");
-                            ss.Write("\t\t" + NormalizePath(Path.Combine(Helper.MakePathRelativeTo(solution.FullPath, project.Path), file)));
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                ss.WriteLine();
-                ss.WriteLine();
-
-                if (project.Type == ProjectType.Library)
-                {
-                    ss.WriteLine("install-data-local:");
-                    ss.WriteLine("      echo \"$(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS)\";  \\");
-                    ss.WriteLine("      $(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS) || exit 1;");
-                    ss.WriteLine();
-                    ss.WriteLine("uninstall-local:");
-                    ss.WriteLine("      echo \"$(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS)\"; \\");
-                    ss.WriteLine("      $(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS) || exit 1;");
-                    ss.WriteLine();
-                }
-                ss.WriteLine("CLEANFILES = $(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".mdb $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".pdb " + project.AssemblyName + ".xml");
-                ss.WriteLine("EXTRA_DIST = \\");
-                ss.Write("      $(FILES)");
-                foreach (ConfigurationNode conf in project.Configurations)
-                {
-                    if (conf.Options.KeyFile != "")
-                    {
-                        ss.Write(" \\");
-                        ss.WriteLine("\t" + conf.Options.KeyFile);
-                    }
-                    break;
-                }
-            }
-            m_Kernel.CurrentWorkingDirectory.Pop();
-        }
-        bool hasLibrary = false;
-
-        private void WriteCombineOld(SolutionNode solution)
-        {
-
-            /* TODO: These vars should be pulled from the prebuild.xml file */
-            string releaseVersion = "2.0.0";
-            string assemblyVersion = "2.1.0.0";
-            string description =
-              "Tao Framework " + solution.Name + " Binding For .NET";
-
-            hasLibrary = false;
-            m_Kernel.Log.Write("Creating Autotools make files");
-            foreach (ProjectNode project in solution.Projects)
-            {
-                if (m_Kernel.AllowProject(project.FilterGroups))
-                {
-                    m_Kernel.Log.Write("...Creating makefile: {0}", project.Name);
-                    WriteProject(solution, project);
-                }
-            }
-
-            m_Kernel.Log.Write("");
-            string combFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "am");
-            StreamWriter ss = new StreamWriter(combFile);
-            ss.NewLine = "\n";
-
-            m_Kernel.CurrentWorkingDirectory.Push();
-            Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
-
-            using (ss)
-            {
-                foreach (ProjectNode project in solution.ProjectsTableOrder)
-                {
-                    if (project.Type == ProjectType.Library)
-                    {
-                        hasLibrary = true;
-                        break;
-                    }
-                }
-
-                if (hasLibrary)
-                {
-                    ss.Write("pkgconfig_in_files = ");
-                    foreach (ProjectNode project in solution.ProjectsTableOrder)
-                    {
-                        if (project.Type == ProjectType.Library)
-                        {
-                            string combFilepc = Helper.MakeFilePath(solution.FullPath, project.Name, "pc.in");
-                            ss.Write(" " + project.Name + ".pc.in ");
-                            StreamWriter sspc = new StreamWriter(combFilepc);
-                            sspc.NewLine = "\n";
-                            using (sspc)
-                            {
-                                sspc.WriteLine("prefix=@prefix@");
-                                sspc.WriteLine("exec_prefix=${prefix}");
-                                sspc.WriteLine("libdir=${exec_prefix}/lib");
-                                sspc.WriteLine();
-                                sspc.WriteLine("Name: @PACKAGE_NAME@");
-                                sspc.WriteLine("Description: @DESCRIPTION@");
-                                sspc.WriteLine("Version: @ASSEMBLY_VERSION@");
-                                sspc.WriteLine("Libs:  -r:${libdir}/mono/gac/@PACKAGE_NAME@/@ASSEMBLY_VERSION@__@PUBKEY@/@PACKAGE_NAME@.dll");
-                            }
-                        }
-                    }
-
-                    ss.WriteLine();
-                    ss.WriteLine("pkgconfigdir=$(prefix)/lib/pkgconfig");
-                    ss.WriteLine("pkgconfig_DATA=$(pkgconfig_in_files:.pc.in=.pc)");
-                }
-                ss.WriteLine();
-                foreach (ProjectNode project in solution.ProjectsTableOrder)
-                {
-                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                    ss.WriteLine("-include x {0}",
-                        Helper.NormalizePath(Helper.MakeFilePath(path, "Include", "am"), '/'));
-                }
-                ss.WriteLine();
-                ss.WriteLine("all: \\");
-                ss.Write("\t");
-                foreach (ProjectNode project in solution.ProjectsTableOrder)
-                {
-                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                    ss.Write(Helper.AssemblyFullName(project.AssemblyName, project.Type) + " ");
-
-                }
-                ss.WriteLine();
-                if (hasLibrary)
-                {
-                    ss.WriteLine("EXTRA_DIST = \\");
-                    ss.WriteLine("\t$(pkgconfig_in_files)");
-                }
-                else
-                {
-                    ss.WriteLine("EXTRA_DIST = ");
-                }
-                ss.WriteLine();
-                ss.WriteLine("DISTCLEANFILES = \\");
-                ss.WriteLine("\tconfigure \\");
-                ss.WriteLine("\tMakefile.in  \\");
-                ss.WriteLine("\taclocal.m4");
-            }
-            combFile = Helper.MakeFilePath(solution.FullPath, "configure", "ac");
-            StreamWriter ts = new StreamWriter(combFile);
-            ts.NewLine = "\n";
-            using (ts)
-            {
-                if (this.hasLibrary)
-                {
-                    foreach (ProjectNode project in solution.ProjectsTableOrder)
-                    {
-                        if (project.Type == ProjectType.Library)
-                        {
-                            ts.WriteLine("AC_INIT(" + project.Name + ".pc.in)");
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    ts.WriteLine("AC_INIT(Makefile.am)");
-                }
-                ts.WriteLine("AC_PREREQ(2.53)");
-                ts.WriteLine("AC_CANONICAL_SYSTEM");
-
-                ts.WriteLine("PACKAGE_NAME={0}", solution.Name);
-                ts.WriteLine("PACKAGE_VERSION={0}", releaseVersion);
-                ts.WriteLine("DESCRIPTION=\"{0}\"", description);
-                ts.WriteLine("AC_SUBST(DESCRIPTION)");
-                ts.WriteLine("AM_INIT_AUTOMAKE([$PACKAGE_NAME],[$PACKAGE_VERSION],[$DESCRIPTION])");
-
-                ts.WriteLine("ASSEMBLY_VERSION={0}", assemblyVersion);
-                ts.WriteLine("AC_SUBST(ASSEMBLY_VERSION)");
-
-                ts.WriteLine("PUBKEY=`sn -t $PACKAGE_NAME.snk | grep 'Public Key Token' | awk -F: '{print $2}' | sed -e 's/^ //'`");
-                ts.WriteLine("AC_SUBST(PUBKEY)");
-
-                ts.WriteLine();
-                ts.WriteLine("AM_MAINTAINER_MODE");
-                ts.WriteLine();
-                ts.WriteLine("dnl AC_PROG_INTLTOOL([0.25])");
-                ts.WriteLine();
-                ts.WriteLine("AC_PROG_INSTALL");
-                ts.WriteLine();
-                ts.WriteLine("MONO_REQUIRED_VERSION=1.1");
-                ts.WriteLine();
-                ts.WriteLine("AC_MSG_CHECKING([whether we're compiling from CVS])");
-                ts.WriteLine("if test -f \"$srcdir/.cvs_version\" ; then");
-                ts.WriteLine("        from_cvs=yes");
-                ts.WriteLine("else");
-                ts.WriteLine("  if test -f \"$srcdir/.svn\" ; then");
-                ts.WriteLine("        from_cvs=yes");
-                ts.WriteLine("  else");
-                ts.WriteLine("        from_cvs=no");
-                ts.WriteLine("  fi");
-                ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("AC_MSG_RESULT($from_cvs)");
-                ts.WriteLine();
-                ts.WriteLine("AC_PATH_PROG(MONO, mono)");
-                ts.WriteLine("AC_PATH_PROG(GMCS, gmcs)");
-                ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil)");
-                ts.WriteLine();
-                ts.WriteLine("AC_MSG_CHECKING([for mono])");
-                ts.WriteLine("dnl if test \"x$MONO\" = \"x\" ; then");
-                ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"mono\" in your PATH])");
-                ts.WriteLine("dnl else");
-                ts.WriteLine("  AC_MSG_RESULT([found])");
-                ts.WriteLine("dnl fi");
-                ts.WriteLine();
-                ts.WriteLine("AC_MSG_CHECKING([for gmcs])");
-                ts.WriteLine("dnl if test \"x$GMCS\" = \"x\" ; then");
-                ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"gmcs\" in your PATH])");
-                ts.WriteLine("dnl else");
-                ts.WriteLine("  AC_MSG_RESULT([found])");
-                ts.WriteLine("dnl fi");
-                ts.WriteLine();
-                //ts.WriteLine("AC_MSG_CHECKING([for gacutil])");
-                //ts.WriteLine("if test \"x$GACUTIL\" = \"x\" ; then");
-                //ts.WriteLine("  AC_MSG_ERROR([Can't find \"gacutil\" in your PATH])");
-                //ts.WriteLine("else");
-                //ts.WriteLine("  AC_MSG_RESULT([found])");
-                //ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("AC_SUBST(PATH)");
-                ts.WriteLine("AC_SUBST(LD_LIBRARY_PATH)");
-                ts.WriteLine();
-                ts.WriteLine("dnl CSFLAGS=\"-debug -nowarn:1574\"");
-                ts.WriteLine("CSFLAGS=\"\"");
-                ts.WriteLine("AC_SUBST(CSFLAGS)");
-                ts.WriteLine();
-                //                              ts.WriteLine("AC_MSG_CHECKING(--disable-sdl argument)");
-                //                              ts.WriteLine("AC_ARG_ENABLE(sdl,");
-                //                              ts.WriteLine("    [  --disable-sdl         Disable Sdl interface.],");
-                //                              ts.WriteLine("    [disable_sdl=$disableval],");
-                //                              ts.WriteLine("    [disable_sdl=\"no\"])");
-                //                              ts.WriteLine("AC_MSG_RESULT($disable_sdl)");
-                //                              ts.WriteLine("if test \"$disable_sdl\" = \"yes\"; then");
-                //                              ts.WriteLine("  AC_DEFINE(FEAT_SDL)");
-                //                              ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("dnl Find pkg-config");
-                ts.WriteLine("AC_PATH_PROG(PKGCONFIG, pkg-config, no)");
-                ts.WriteLine("if test \"x$PKG_CONFIG\" = \"xno\"; then");
-                ts.WriteLine("        AC_MSG_ERROR([You need to install pkg-config])");
-                ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)");
-                ts.WriteLine("BUILD_DIR=\"bin\"");
-                ts.WriteLine("AC_SUBST(BUILD_DIR)");
-                ts.WriteLine("CONFIG=\"Release\"");
-                ts.WriteLine("AC_SUBST(CONFIG)");
-                ts.WriteLine();
-                ts.WriteLine("if test \"x$has_mono\" = \"xtrue\"; then");
-                ts.WriteLine("  AC_PATH_PROG(RUNTIME, mono, no)");
-                ts.WriteLine("  AC_PATH_PROG(CSC, gmcs, no)");
-                ts.WriteLine("  if test `uname -s` = \"Darwin\"; then");
-                ts.WriteLine("        LIB_PREFIX=");
-                ts.WriteLine("        LIB_SUFFIX=.dylib");
-                ts.WriteLine("  else");
-                ts.WriteLine("        LIB_PREFIX=.so");
-                ts.WriteLine("        LIB_SUFFIX=");
-                ts.WriteLine("  fi");
-                ts.WriteLine("else");
-                ts.WriteLine("  AC_PATH_PROG(CSC, csc.exe, no)");
-                ts.WriteLine("  if test x$CSC = \"xno\"; then");
-                ts.WriteLine("        AC_MSG_ERROR([You need to install either mono or .Net])");
-                ts.WriteLine("  else");
-                ts.WriteLine("    RUNTIME=");
-                ts.WriteLine("    LIB_PREFIX=");
-                ts.WriteLine("    LIB_SUFFIX=.dylib");
-                ts.WriteLine("  fi");
-                ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("AC_SUBST(LIB_PREFIX)");
-                ts.WriteLine("AC_SUBST(LIB_SUFFIX)");
-                ts.WriteLine();
-                ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_CFLAGS)");
-                ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_LIBS)");
-                ts.WriteLine();
-                ts.WriteLine("dnl Find monodoc");
-                ts.WriteLine("MONODOC_REQUIRED_VERSION=1.0");
-                ts.WriteLine("AC_SUBST(MONODOC_REQUIRED_VERSION)");
-                ts.WriteLine("PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)");
-                ts.WriteLine();
-                ts.WriteLine("if test \"x$enable_monodoc\" = \"xyes\"; then");
-                ts.WriteLine("        AC_PATH_PROG(MONODOC, monodoc, no)");
-                ts.WriteLine("        if test x$MONODOC = xno; then");
-                ts.WriteLine("           enable_monodoc=no");
-                ts.WriteLine("        fi");
-                ts.WriteLine("else");
-                ts.WriteLine("        MONODOC=");
-                ts.WriteLine("fi");
-                ts.WriteLine();
-                ts.WriteLine("AC_SUBST(MONODOC)");
-                ts.WriteLine("AM_CONDITIONAL(ENABLE_MONODOC, test \"x$enable_monodoc\" = \"xyes\")");
-                ts.WriteLine();
-                ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil, no)");
-                ts.WriteLine("if test \"x$GACUTIL\" = \"xno\" ; then");
-                ts.WriteLine("        AC_MSG_ERROR([No gacutil tool found])");
-                ts.WriteLine("fi");
-                ts.WriteLine();
-                //                              foreach(ProjectNode project in solution.ProjectsTableOrder)
-                //                              {
-                //                                      if (project.Type == ProjectType.Library)
-                //                                      {
-                //                                      }
-                //                              }
-                ts.WriteLine("GACUTIL_FLAGS='/package $(PACKAGE_NAME) /gacdir $(DESTDIR)$(prefix)'");
-                ts.WriteLine("AC_SUBST(GACUTIL_FLAGS)");
-                ts.WriteLine();
-                ts.WriteLine("winbuild=no");
-                ts.WriteLine("case \"$host\" in");
-                ts.WriteLine("       *-*-mingw*|*-*-cygwin*)");
-                ts.WriteLine("               winbuild=yes");
-                ts.WriteLine("               ;;");
-                ts.WriteLine("esac");
-                ts.WriteLine("AM_CONDITIONAL(WINBUILD, test x$winbuild = xyes)");
-                ts.WriteLine();
-                //                              ts.WriteLine("dnl Check for SDL");
-                //                              ts.WriteLine();
-                //                              ts.WriteLine("AC_PATH_PROG([SDL_CONFIG], [sdl-config])");
-                //                              ts.WriteLine("have_sdl=no");
-                //                              ts.WriteLine("if test -n \"${SDL_CONFIG}\"; then");
-                //                              ts.WriteLine("    have_sdl=yes");
-                //                              ts.WriteLine("    SDL_CFLAGS=`$SDL_CONFIG --cflags`");
-                //                              ts.WriteLine("    SDL_LIBS=`$SDL_CONFIG --libs`");
-                //                              ts.WriteLine("    #");
-                //                              ts.WriteLine("    # sdl-config sometimes emits an rpath flag pointing at its library");
-                //                              ts.WriteLine("    # installation directory.  We don't want this, as it prevents users from");
-                //                              ts.WriteLine("    # linking sdl-viewer against, for example, a locally compiled libGL when a");
-                //                              ts.WriteLine("    # version of the library also exists in SDL's library installation");
-                //                              ts.WriteLine("    # directory, typically /usr/lib.");
-                //                              ts.WriteLine("    #");
-                //                              ts.WriteLine("    SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`");
-                //                              ts.WriteLine("fi");
-                //                              ts.WriteLine("AC_SUBST([SDL_CFLAGS])");
-                //                              ts.WriteLine("AC_SUBST([SDL_LIBS])");
-                ts.WriteLine();
-                ts.WriteLine("AC_OUTPUT([");
-                ts.WriteLine("Makefile");
-                // TODO: this does not work quite right.
-                //ts.WriteLine("Properties/AssemblyInfo.cs");
-                foreach (ProjectNode project in solution.ProjectsTableOrder)
-                {
-                    if (project.Type == ProjectType.Library)
-                    {
-                        ts.WriteLine(project.Name + ".pc");
-                    }
-                    //                                  string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
-                    //                                  ts.WriteLine(Helper.NormalizePath(Helper.MakeFilePath(path, "Include"),'/'));
-                }
-                ts.WriteLine("])");
-                ts.WriteLine();
-                ts.WriteLine("#po/Makefile.in");
-                ts.WriteLine();
-                ts.WriteLine("echo \"---\"");
-                ts.WriteLine("echo \"Configuration summary\"");
-                ts.WriteLine("echo \"\"");
-                ts.WriteLine("echo \"   * Installation prefix: $prefix\"");
-                ts.WriteLine("echo \"   * compiler:            $CSC\"");
-                ts.WriteLine("echo \"   * Documentation:       $enable_monodoc ($MONODOC)\"");
-                ts.WriteLine("echo \"   * Package Name:        $PACKAGE_NAME\"");
-                ts.WriteLine("echo \"   * Version:             $PACKAGE_VERSION\"");
-                ts.WriteLine("echo \"   * Public Key:          $PUBKEY\"");
-                ts.WriteLine("echo \"\"");
-                ts.WriteLine("echo \"---\"");
-                ts.WriteLine();
-            }
-
-            ts.NewLine = "\n";
-            foreach (ProjectNode project in solution.ProjectsTableOrder)
-            {
-                if (project.GenerateAssemblyInfoFile)
-                {
-                    GenerateAssemblyInfoFile(solution, combFile);
-                }
-            }
-        }
-
-        private static void GenerateAssemblyInfoFile(SolutionNode solution, string combFile)
-        {
-            System.IO.Directory.CreateDirectory(Helper.MakePathRelativeTo(solution.FullPath, "Properties"));
-            combFile = Helper.MakeFilePath(solution.FullPath + "/Properties/", "AssemblyInfo.cs", "in");
-            StreamWriter ai = new StreamWriter(combFile);
-
-            using (ai)
-            {
-                ai.WriteLine("#region License");
-                ai.WriteLine("/*");
-                ai.WriteLine("MIT License");
-                ai.WriteLine("Copyright (c)2003-2006 Tao Framework Team");
-                ai.WriteLine("http://www.taoframework.com");
-                ai.WriteLine("All rights reserved.");
-                ai.WriteLine("");
-                ai.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a copy");
-                ai.WriteLine("of this software and associated documentation files (the \"Software\"), to deal");
-                ai.WriteLine("in the Software without restriction, including without limitation the rights");
-                ai.WriteLine("to use, copy, modify, merge, publish, distribute, sublicense, and/or sell");
-                ai.WriteLine("copies of the Software, and to permit persons to whom the Software is");
-                ai.WriteLine("furnished to do so, subject to the following conditions:");
-                ai.WriteLine("");
-                ai.WriteLine("The above copyright notice and this permission notice shall be included in all");
-                ai.WriteLine("copies or substantial portions of the Software.");
-                ai.WriteLine("");
-                ai.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
-                ai.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
-                ai.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE");
-                ai.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
-                ai.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,");
-                ai.WriteLine("OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE");
-                ai.WriteLine("SOFTWARE.");
-                ai.WriteLine("*/");
-                ai.WriteLine("#endregion License");
-                ai.WriteLine("");
-                ai.WriteLine("using System;");
-                ai.WriteLine("using System.Reflection;");
-                ai.WriteLine("using System.Runtime.InteropServices;");
-                ai.WriteLine("using System.Security;");
-                ai.WriteLine("using System.Security.Permissions;");
-                ai.WriteLine("");
-                ai.WriteLine("[assembly: AllowPartiallyTrustedCallers]");
-                ai.WriteLine("[assembly: AssemblyCompany(\"Tao Framework -- http://www.taoframework.com\")]");
-                ai.WriteLine("[assembly: AssemblyConfiguration(\"Retail\")]");
-                ai.WriteLine("[assembly: AssemblyCopyright(\"Copyright (c)2003-2006 Tao Framework Team.  All rights reserved.\")]");
-                ai.WriteLine("[assembly: AssemblyCulture(\"\")]");
-                ai.WriteLine("[assembly: AssemblyDefaultAlias(\"@PACKAGE_NAME@\")]");
-                ai.WriteLine("[assembly: AssemblyDelaySign(false)]");
-                ai.WriteLine("[assembly: AssemblyDescription(\"@DESCRIPTION@\")]");
-                ai.WriteLine("[assembly: AssemblyFileVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: AssemblyInformationalVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: AssemblyKeyName(\"\")]");
-                ai.WriteLine("[assembly: AssemblyProduct(\"@PACKAGE_NAME@.dll\")]");
-                ai.WriteLine("[assembly: AssemblyTitle(\"@DESCRIPTION@\")]");
-                ai.WriteLine("[assembly: AssemblyTrademark(\"Tao Framework -- http://www.taoframework.com\")]");
-                ai.WriteLine("[assembly: AssemblyVersion(\"@ASSEMBLY_VERSION@\")]");
-                ai.WriteLine("[assembly: CLSCompliant(true)]");
-                ai.WriteLine("[assembly: ComVisible(false)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.Execution)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.SkipVerification)]");
-                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.UnmanagedCode)]");
-
-            }
-            //return combFile;
-        }
-
         private void CleanProject(ProjectNode project)
         {
             m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
@@ -1677,7 +966,7 @@ namespace Prebuild.Core.Targets
             m_Kernel.Log.Write("Parsing system pkg-config files");
             RunInitialization();
 
-            string streamName = "autotools.xml";
+            const string streamName = "autotools.xml";
             string fqStreamName = String.Format("Prebuild.data.{0}",
                                                 streamName
                                                 );
@@ -1727,10 +1016,9 @@ namespace Prebuild.Core.Targets
 
             string pwd = Directory.GetCurrentDirectory();
             //string pwd = System.Environment.GetEnvironmentVariable("PWD");
-            string rootDir = "";
             //if (pwd.Length != 0)
             //{
-            rootDir = Path.Combine(pwd, "autotools");
+            string rootDir = Path.Combine(pwd, "autotools");
             //}
             //else
             //{
diff --git a/Prebuild/src/Core/Targets/DebugTarget.cs b/Prebuild/src/Core/Targets/DebugTarget.cs
index dc4e666..650007e 100644
--- a/Prebuild/src/Core/Targets/DebugTarget.cs
+++ b/Prebuild/src/Core/Targets/DebugTarget.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,	EVEN IF	ADVISED	OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
+ * $Date: 2006-09-20 08:42:51 +0100 (Wed, 20 Sep 2006) $
  * $Revision: 164 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Targets/MakefileTarget.cs b/Prebuild/src/Core/Targets/MakefileTarget.cs
index 86676d0..54046dd 100644
--- a/Prebuild/src/Core/Targets/MakefileTarget.cs
+++ b/Prebuild/src/Core/Targets/MakefileTarget.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.IO;
 using System.Text.RegularExpressions;
 
@@ -110,7 +108,7 @@ namespace Prebuild.Core.Targets
             {
                 string path;
                 // Project references change with configurations.
-                if (solution.ProjectsTable.Contains(refr.Name))
+                if (solution.ProjectsTable.ContainsKey(refr.Name))
                     continue;
                 path = FindFileReference(refr.Name, project);
                 if (path != null)
@@ -220,7 +218,7 @@ namespace Prebuild.Core.Targets
                 }
                 // Dependencies on other projects.
                 foreach (ReferenceNode refr in project.References)
-                    if (solution.ProjectsTable.Contains(refr.Name))
+                    if (solution.ProjectsTable.ContainsKey(refr.Name))
                     {
                         ProjectNode refProj = (ProjectNode)solution.ProjectsTable[refr.Name];
                         if (ProjectClashes(refProj))
@@ -256,7 +254,7 @@ namespace Prebuild.Core.Targets
                 // Build references to other projects. Now that sux.
                 // We have to reference the other project in the same conf.
                 foreach (ReferenceNode refr in project.References)
-                    if (solution.ProjectsTable.Contains(refr.Name))
+                    if (solution.ProjectsTable.ContainsKey(refr.Name))
                     {
                         ProjectNode refProj;
                         refProj = (ProjectNode)solution.ProjectsTable[refr.Name];
@@ -274,7 +272,7 @@ namespace Prebuild.Core.Targets
                     {
                         string outPath, srcPath, destPath;
                         outPath = Helper.NormalizePath((string)conf.Options["OutputPath"]);
-                        if (solution.ProjectsTable.Contains(refr.Name))
+                        if (solution.ProjectsTable.ContainsKey(refr.Name))
                         {
                             ProjectNode refProj;
                             refProj = (ProjectNode)solution.ProjectsTable[refr.Name];
diff --git a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
index c8401fd..ea6d2c2 100644
--- a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
+++ b/Prebuild/src/Core/Targets/MonoDevelopTarget.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.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -274,7 +272,11 @@ namespace Prebuild.Core.Targets
                                 ss.WriteLine("  <Contents>");
                                 foreach(string file in project.Files)
                                 {
-                                        string buildAction = "Compile";
+                                        string buildAction;
+                                        string dependson = "";
+                                        string resource_id = "";
+                                        string copyToOutput = "";
+                                        
                                         switch(project.Files.GetBuildAction(file))
                                         {
                                                 case BuildAction.None:
@@ -294,9 +296,58 @@ namespace Prebuild.Core.Targets
                                                         break;
                                         }
 
+                    if (project.Files.GetCopyToOutput(file) != CopyToOutput.Never)
+                                                    buildAction = "FileCopy";
+
                                         // Sort of a hack, we try and resolve the path and make it relative, if we can.
-                                        string filePath = PrependPath(file);
-                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
+                                        string extension = Path.GetExtension(file);
+                                        string designer_format = string.Format(".Designer{0}", extension);
+
+                                        if (file.EndsWith(designer_format))
+                                        {
+                                                string basename = file.Substring(0, file.LastIndexOf(designer_format));
+                                                string[] extensions = new string[] { ".cs", ".resx", ".settings" };
+
+                                                foreach(string ext in extensions)
+                                                {
+                                                        if (project.Files.Contains(basename + ext))
+                                                        {
+                                                                dependson = string.Format(" dependson=\"{0}{1}\"", basename, ext);
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                        if (extension == ".resx")
+                                        {
+                                                buildAction = "EmbedAsResource";
+                                                string basename = file.Substring(0, file.LastIndexOf(".resx"));                                         
+                                                
+                                                // Visual Studio type resx + form dependency
+                                                if (project.Files.Contains(basename + ".cs"))
+                                                {
+                                                        dependson = string.Format(" dependson=\"{0}{1}\"", basename, ".cs");
+                                                }
+
+                                                // We need to specify a resources file name to avoid MissingManifestResourceExceptions
+                                                // in libraries that are built.
+                                                resource_id = string.Format(" resource_id=\"{0}.{1}.resources\"",
+                                                                project.AssemblyName, basename.Replace("/", "."));
+                                        }
+
+                                        switch(project.Files.GetCopyToOutput(file))
+                                        {
+                                                case CopyToOutput.Always:
+                                                        copyToOutput = string.Format(" copyToOutputDirectory=\"Always\"");
+                                                        break;
+                                                case CopyToOutput.PreserveNewest:
+                                                        copyToOutput = string.Format(" copyToOutputDirectory=\"PreserveNewest\"");
+                                                        break;
+                                        }
+                                        
+                                        // Sort of a hack, we try and resolve the path and make it relative, if we can.
+                                        string filePath = PrependPath(file);
+                                        ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\"{2}{3}{4} />", 
+                                                     filePath, buildAction, dependson, resource_id, copyToOutput);
                                 }
                                 ss.WriteLine("  </Contents>");
 
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 9a6ee17..d4a33f8 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -36,10 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Text.RegularExpressions;
 
 using Prebuild.Core.Attributes;
@@ -255,9 +253,12 @@ namespace Prebuild.Core.Targets
                                 ss.WriteLine("                    {0}", "</fileset>");
                                 ss.WriteLine("            {0}", "</copy>");
 
-                                ss.Write("                <csc");
+                                ss.Write("                <csc ");
                                 ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower());
                                 ss.Write(" debug=\"{0}\"", "${build.debug}");
+                                ss.Write(" platform=\"${build.platform}\"");
+
+
                                 foreach (ConfigurationNode conf in project.Configurations)
                                 {
                                         if (conf.Options.KeyFile != "")
@@ -311,7 +312,12 @@ namespace Prebuild.Core.Targets
                                 {
                                         ss.Write(" win32icon=\"{0}\"", Helper.NormalizePath(project.AppIcon, '/'));
                                 }
-                                ss.WriteLine(">");
+                // This disables a very different behavior between VS and NAnt.  With Nant,
+                //    If you have using System.Xml;  it will ensure System.Xml.dll is referenced,
+                //    but not in VS.  This will force the behaviors to match, so when it works
+                //    in nant, it will work in VS.
+                ss.Write(" noconfig=\"true\"");
+                ss.WriteLine(">");
                                 ss.WriteLine("                    <resources prefix=\"{0}\" dynamicprefix=\"true\" >", project.RootNamespace);
                                 foreach (string file in project.Files)
                                 {
@@ -357,7 +363,20 @@ namespace Prebuild.Core.Targets
                                 foreach (ReferenceNode refr in project.References)
                                 {
                                         string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
-                    ss.WriteLine("                <include name=\"" + path + "\" />");
+                    if (refr.Path != null) {
+                        if (ExtensionSpecified(refr.Name))
+                        {
+                            ss.WriteLine ("                <include name=\"" + path + refr.Name + "\"/>");
+                        }
+                        else
+                        {
+                            ss.WriteLine ("                <include name=\"" + path + refr.Name + ".dll\"/>");
+                        }
+                    }
+                    else
+                    {
+                        ss.WriteLine ("                <include name=\"" + path + "\" />");
+                    }
                                 }
                                 ss.WriteLine("                    </references>");
 
@@ -490,15 +509,32 @@ namespace Prebuild.Core.Targets
                                 ss.WriteLine("    <property name=\"doc.dir\" value=\"doc\" />");
                                 ss.WriteLine("    <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
 
-                // actually use active config out of prebuild.xml
-                ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", solution.ActiveConfig);
+                                // Use the active configuration, which is the first configuration name in the prebuild file.
+                                Dictionary<string,string> emittedConfigurations = new Dictionary<string, string>();
+
+                                ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", solution.ActiveConfig);
+                                ss.WriteLine();
 
                                 foreach (ConfigurationNode conf in solution.Configurations)
                                 {
-                                        ss.WriteLine();
-                                        ss.WriteLine("    <target name=\"{0}\" description=\"\">", conf.Name);
+                                        // If the name isn't in the emitted configurations, we give a high level target to the 
+                                        // platform specific on. This lets "Debug" point to "Debug-AnyCPU".
+                                        if (!emittedConfigurations.ContainsKey(conf.Name))
+                                        {
+                                                // Add it to the dictionary so we only emit one.
+                                                emittedConfigurations.Add(conf.Name, conf.Platform);
+
+                                                // Write out the target block.
+                                                ss.WriteLine("    <target name=\"{0}\" description=\"{0}|{1}\" depends=\"{0}-{1}\">", conf.Name, conf.Platform);
+                                                ss.WriteLine("    </target>");
+                                                ss.WriteLine();
+                                        }
+
+                                        // Write out the target for the configuration.
+                                        ss.WriteLine("    <target name=\"{0}-{1}\" description=\"{0}|{1}\">", conf.Name, conf.Platform);
                                         ss.WriteLine("            <property name=\"project.config\" value=\"{0}\" />", conf.Name);
                                         ss.WriteLine("            <property name=\"build.debug\" value=\"{0}\" />", conf.Options["DebugInformation"].ToString().ToLower());
+                                        ss.WriteLine("\t\t  <property name=\"build.platform\" value=\"{0}\" />", conf.Platform);
                                         ss.WriteLine("    </target>");
                                         ss.WriteLine();
                                 }
@@ -559,19 +595,19 @@ namespace Prebuild.Core.Targets
                         if (item is DirectoryInfo) { }
                         else if (item is FileInfo)
                         {
-                            if (re.Match(((FileInfo)item).FullName) !=
+                            if (re.Match(item.FullName) !=
                                 System.Text.RegularExpressions.Match.Empty)
                             {
-                                Console.WriteLine("Including file: " + ((FileInfo)item).FullName);
+                                Console.WriteLine("Including file: " + item.FullName);
 
-                                using (FileStream fs = new FileStream(((FileInfo)item).FullName,
+                                using (FileStream fs = new FileStream(item.FullName,
                                                                       FileMode.Open,
                                                                       FileAccess.Read,
                                                                       FileShare.None))
                                 {
                                     using (StreamReader sr = new StreamReader(fs))
                                     {
-                                        ss.WriteLine("<!-- included from {0} -->", ((FileInfo)item).FullName);
+                                        ss.WriteLine("<!-- included from {0} -->", (item).FullName);
                                         while (sr.Peek() != -1)
                                         {
                                             ss.WriteLine(sr.ReadLine());
@@ -601,6 +637,10 @@ namespace Prebuild.Core.Targets
                 ss.WriteLine("    <target name=\"clean\" description=\"\">");
                 ss.WriteLine("        <echo message=\"Deleting all builds from all configurations\" />");
                 //ss.WriteLine("        <delete dir=\"${dist.dir}\" failonerror=\"false\" />");
+
+                // justincc: FIXME FIXME FIXME - A temporary OpenSim hack to clean up files when "nant clean" is executed.
+                // Should be replaced with extreme prejudice once anybody finds out if the CleanFiles stuff works or there is
+                // another working mechanism for specifying this stuff
                 ss.WriteLine("        <delete failonerror=\"false\">");
                 ss.WriteLine("        <fileset basedir=\"${bin.dir}\">");
                 ss.WriteLine("            <include name=\"OpenSim*.dll\"/>");
@@ -611,7 +651,21 @@ namespace Prebuild.Core.Targets
                 ss.WriteLine("            <exclude name=\"ScriptEngines/Default.lsl\"/>");
                 ss.WriteLine("        </fileset>");
                 ss.WriteLine("        </delete>");
-                ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
+
+                if (solution.Cleanup != null && solution.Cleanup.CleanFiles.Count > 0)
+                {
+                    foreach (CleanFilesNode cleanFile in solution.Cleanup.CleanFiles)
+                    {
+                        ss.WriteLine("        <delete failonerror=\"false\">");
+                        ss.WriteLine("            <fileset basedir=\"${project::get-base-directory()}\">");
+                        ss.WriteLine("                <include name=\"{0}/*\"/>", cleanFile.Pattern);
+                        ss.WriteLine("                <include name=\"{0}\"/>", cleanFile.Pattern);
+                        ss.WriteLine("            </fileset>");
+                        ss.WriteLine("        </delete>");
+                    }
+                }
+
+                            ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
                 foreach (ProjectNode project in solution.Projects)
                 {
                     string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
diff --git a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
index cf7ce02..8e32050 100644
--- a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
+++ b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
@@ -24,11 +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.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Reflection;
 
 using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
diff --git a/Prebuild/src/Core/Targets/VS2003Target.cs b/Prebuild/src/Core/Targets/VS2003Target.cs
index 1bcb7dc..10e2dc4 100644
--- a/Prebuild/src/Core/Targets/VS2003Target.cs
+++ b/Prebuild/src/Core/Targets/VS2003Target.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.IO;
 
 using Prebuild.Core.Attributes;
@@ -47,7 +46,7 @@ namespace Prebuild.Core.Targets
                 string versionName = "2003";
                 VSVersion version = VSVersion.VS71;
 
-                Hashtable m_Tools;
+            readonly Dictionary<string, ToolInfo> m_Tools = new Dictionary<string, ToolInfo>();
                 Kernel m_Kernel;
 
                 /// <summary>
@@ -58,11 +57,11 @@ namespace Prebuild.Core.Targets
                 {
                         get
                         {
-                                return this.solutionVersion;
+                                return solutionVersion;
                         }
                         set
                         {
-                                this.solutionVersion = value;
+                                solutionVersion = value;
                         }
                 }
                 /// <summary>
@@ -73,11 +72,11 @@ namespace Prebuild.Core.Targets
                 {
                         get
                         {
-                                return this.productVersion;
+                                return productVersion;
                         }
                         set
                         {
-                                this.productVersion = value;
+                                productVersion = value;
                         }
                 }
                 /// <summary>
@@ -88,11 +87,11 @@ namespace Prebuild.Core.Targets
                 {
                         get
                         {
-                                return this.schemaVersion;
+                                return schemaVersion;
                         }
                         set
                         {
-                                this.schemaVersion = value;
+                                schemaVersion = value;
                         }
                 }
                 /// <summary>
@@ -103,11 +102,11 @@ namespace Prebuild.Core.Targets
                 {
                         get
                         {
-                                return this.versionName;
+                                return versionName;
                         }
                         set
                         {
-                                this.versionName = value;
+                                versionName = value;
                         }
                 }
                 /// <summary>
@@ -118,11 +117,11 @@ namespace Prebuild.Core.Targets
                 {
                         get
                         {
-                                return this.version;
+                                return version;
                         }
                         set
                         {
-                                this.version = value;
+                                version = value;
                         }
                 }
 
@@ -135,8 +134,6 @@ namespace Prebuild.Core.Targets
                 /// </summary>
                 public VS2003Target()
                 {
-                        m_Tools = new Hashtable();
-
                         m_Tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP");
                         m_Tools["VB.NET"] = new ToolInfo("VB.NET", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic");
                 }
@@ -178,23 +175,20 @@ namespace Prebuild.Core.Targets
                                 throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
                         }
 
-                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+                        ToolInfo toolInfo = m_Tools[project.Language];
                         string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
                         StreamWriter ps = new StreamWriter(projectFile);
 
                         m_Kernel.CurrentWorkingDirectory.Push();
                         Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
 
-                        IEnumerator enumerator;
-                        //ConfigurationNode scripts;
-
                         using(ps)
                         {
                                 ps.WriteLine("<VisualStudioProject>");
                                 ps.WriteLine("    <{0}", toolInfo.XmlTag);
                                 ps.WriteLine("\t\t\t\tProjectType = \"Local\"");
-                                ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", this.ProductVersion);
-                                ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", this.SchemaVersion);
+                                ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", ProductVersion);
+                                ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", SchemaVersion);
                                 ps.WriteLine("\t\t\t\tProjectGuid = \"{{{0}}}\"", project.Guid.ToString().ToUpper());
                                 ps.WriteLine("\t\t>");
 
@@ -209,16 +203,13 @@ namespace Prebuild.Core.Targets
                                 ps.WriteLine("\t\t\t\t  DefaultTargetSchema = \"IE50\"");
                                 ps.WriteLine("\t\t\t\t  DelaySign = \"false\"");
 
-                                if(this.Version == VSVersion.VS70)
+                                if(Version == VSVersion.VS70)
                                 {
                                         ps.WriteLine("\t\t\t\t  NoStandardLibraries = \"false\"");
                                 }
 
-                                ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type.ToString());
+                                ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type);
 
-                                enumerator = project.Configurations.GetEnumerator();
-                                enumerator.Reset();
-                                enumerator.MoveNext();
                                 foreach(ConfigurationNode conf in project.Configurations)
                                 {
                                         if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
@@ -266,7 +257,7 @@ namespace Prebuild.Core.Targets
                                         ps.WriteLine("\t\t\t\t      FileAlignment = \"{0}\"", conf.Options["FileAlignment"]);
                                         ps.WriteLine("\t\t\t\t      IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"].ToString().ToLower());
                     
-                                        if(this.Version == VSVersion.VS71)
+                                        if(Version == VSVersion.VS71)
                                         {
                                                 ps.WriteLine("\t\t\t\t      NoStdLib = \"{0}\"", conf.Options["NoStdLib"].ToString().ToLower());
                                                 ps.WriteLine("\t\t\t\t      NoWarn = \"{0}\"", conf.Options["SuppressWarnings"].ToString().ToLower());
@@ -293,9 +284,9 @@ namespace Prebuild.Core.Targets
 
                                         if(solution.ProjectsTable.ContainsKey(refr.Name))
                                         {
-                                                ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+                                                ProjectNode refProject = solution.ProjectsTable[refr.Name];
                                                 ps.WriteLine("                    Project = \"{{{0}}}\"", refProject.Guid.ToString().ToUpper());
-                                                ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToString().ToUpper());
+                                                ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToUpper());
                                         }
                                         else
                                         {
@@ -409,7 +400,7 @@ namespace Prebuild.Core.Targets
 
                 private void WriteSolution(SolutionNode solution)
                 {
-                        m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", this.VersionName);
+                        m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", VersionName);
 
                         foreach(ProjectNode project in solution.Projects)
                         {
@@ -429,7 +420,7 @@ namespace Prebuild.Core.Targets
             
                         using(ss)
                         {
-                                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
+                                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
                                 foreach(ProjectNode project in solution.Projects)
                                 {
                                         if(!m_Tools.ContainsKey(project.Language))
@@ -437,7 +428,7 @@ namespace Prebuild.Core.Targets
                                                 throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
                                         }
 
-                                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+                                        ToolInfo toolInfo = m_Tools[project.Language];
                 
                                         string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
                                         ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
@@ -464,10 +455,10 @@ namespace Prebuild.Core.Targets
                                 {
                                         for(int i = 0; i < project.References.Count; i++)
                                         {
-                                                ReferenceNode refr = (ReferenceNode)project.References[i];
+                                                ReferenceNode refr = project.References[i];
                                                 if(solution.ProjectsTable.ContainsKey(refr.Name))
                                                 {
-                                                        ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+                                                        ProjectNode refProject = solution.ProjectsTable[refr.Name];
                                                         ss.WriteLine("\t\t({{{0}}}).{1} = ({{{2}}})", 
                                                                 project.Guid.ToString().ToUpper()
                                                                 , i, 
@@ -519,7 +510,7 @@ namespace Prebuild.Core.Targets
                 {
                         m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
 
-                        ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+                        ToolInfo toolInfo = m_Tools[project.Language];
                         string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
                         string userFile = projectFile + ".user";
             
@@ -529,7 +520,7 @@ namespace Prebuild.Core.Targets
 
                 private void CleanSolution(SolutionNode solution)
                 {
-                        m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", this.VersionName, solution.Name);
+                        m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", VersionName, solution.Name);
 
                         string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
                         string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
index 63461c9..9c70e26 100644
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ b/Prebuild/src/Core/Targets/VS2005Target.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.IO;
 using System.Text;
 
diff --git a/Prebuild/src/Core/Targets/VS2008Target.cs b/Prebuild/src/Core/Targets/VS2008Target.cs
index e685962..fee4f7f 100644
--- a/Prebuild/src/Core/Targets/VS2008Target.cs
+++ b/Prebuild/src/Core/Targets/VS2008Target.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.IO;
 using System.Text;
 
@@ -27,9 +25,6 @@ namespace Prebuild.Core.Targets
                 string name = "vs2008";
                 VSVersion version = VSVersion.VS90;
 
-                Hashtable tools;
-                Kernel kernel;
-
                 /// <summary>
                 /// Gets or sets the solution version.
                 /// </summary>
@@ -120,7 +115,7 @@ namespace Prebuild.Core.Targets
                 #region Constructors
 
                 /// <summary>
-                /// Initializes a new instance of the <see cref="VS2008Target"/> class.
+                /// Initializes a new instance of the <see cref="VS2005Target"/> class.
                 /// </summary>
                 public VS2008Target()
                         : base()
diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs
index 8772d18..b16120c 100644
--- a/Prebuild/src/Core/Targets/VS2010Target.cs
+++ b/Prebuild/src/Core/Targets/VS2010Target.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Specialized;
+using System;
 using System.IO;
 using System.Text;
 
@@ -13,98 +11,104 @@ using System.CodeDom.Compiler;
 namespace Prebuild.Core.Targets
 {
 
-    /// <summary>
-    /// 
-    /// </summary>
-    [Target("vs2010")]
-    public class VS2010Target : VSGenericTarget
-    {
-        #region Fields
-        string solutionVersion = "11.00";
-        string productVersion = "9.0.21022";
-        string schemaVersion = "2.0";
-        string versionName = "Visual Studio 2010";
-        string name = "vs2008";
-        VSVersion version = VSVersion.VS10;
+        /// <summary>
+        /// 
+        /// </summary>
+        [Target("vs2010")]
+        public class VS2010Target : VSGenericTarget
+        {
+                #region Fields
+                
+                string solutionVersion = "11.00";
+                string productVersion = "9.0.30729";
+                string schemaVersion = "2.0";
+                string versionName = "Visual Studio 2010";
+                string name = "vs2010";
+                VSVersion version = VSVersion.VS10;
 
-        Hashtable tools;
-        Kernel kernel;
-
-        /// <summary>
-        /// Gets or sets the solution version.
-        /// </summary>
-        /// <value>The solution version.</value>
-        public override string SolutionVersion
-        {
-            get
-            {
-                return solutionVersion;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the product version.
-        /// </summary>
-        /// <value>The product version.</value>
-        public override string ProductVersion
-        {
-            get
-            {
-                return productVersion;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the schema version.
-        /// </summary>
-        /// <value>The schema version.</value>
-        public override string SchemaVersion
-        {
-            get
-            {
-                return schemaVersion;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the name of the version.
-        /// </summary>
-        /// <value>The name of the version.</value>
-        public override string VersionName
-        {
-            get
-            {
-                return versionName;
-            }
-        }
-        /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        public override VSVersion Version
-        {
-            get
-            {
-                return version;
-            }
-        }
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public override string Name
-        {
-            get
-            {
-                return name;
-            }
-        }
+                #endregion
+                
+                #region Properties
+                
+                /// <summary>
+                /// Gets or sets the solution version.
+                /// </summary>
+                /// <value>The solution version.</value>
+                public override string SolutionVersion
+                {
+                        get
+                        {
+                                return solutionVersion;
+                        }
+                }
+                
+                /// <summary>
+                /// Gets or sets the product version.
+                /// </summary>
+                /// <value>The product version.</value>
+                public override string ProductVersion
+                {
+                        get
+                        {
+                                return productVersion;
+                        }
+                }
+                
+                /// <summary>
+                /// Gets or sets the schema version.
+                /// </summary>
+                /// <value>The schema version.</value>
+                public override string SchemaVersion
+                {
+                        get
+                        {
+                                return schemaVersion;
+                        }
+                }
+                
+                /// <summary>
+                /// Gets or sets the name of the version.
+                /// </summary>
+                /// <value>The name of the version.</value>
+                public override string VersionName
+                {
+                        get
+                        {
+                                return versionName;
+                        }
+                }
+                
+                /// <summary>
+                /// Gets or sets the version.
+                /// </summary>
+                /// <value>The version.</value>
+                public override VSVersion Version
+                {
+                        get
+                        {
+                                return version;
+                        }
+                }
+                
+                /// <summary>
+                /// Gets the name.
+                /// </summary>
+                /// <value>The name.</value>
+                public override string Name
+                {
+                        get
+                        {
+                                return name;
+                        }
+                }
 
         protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion)
         {
             switch (frameworkVersion)
             {
-                case FrameworkVersion.v4_0:
-                    return "ToolsVersion=\"4.0\"";
+                case FrameworkVersion.v4_0:
                 case FrameworkVersion.v3_5:
-                    return "ToolsVersion=\"3.5\"";
+                        return "ToolsVersion=\"4.0\"";
                 case FrameworkVersion.v3_0:
                     return "ToolsVersion=\"3.0\"";
                 default:
@@ -117,18 +121,18 @@ namespace Prebuild.Core.Targets
             get { return "# Visual Studio 2010"; }
         }
 
-        #endregion
+            #endregion
 
-        #region Constructors
+                #region Constructors
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VS2010Target"/> class.
-        /// </summary>
-        public VS2010Target()
-            : base()
-        {
-        }
+                /// <summary>
+                /// Initializes a new instance of the <see cref="VS2005Target"/> class.
+                /// </summary>
+                public VS2010Target()
+                        : base()
+                {
+                }
 
-        #endregion
-    }
+                #endregion
+        }
 }
diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index fdcc2b9..cd3f5bb 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -5,32 +5,27 @@ Copyright (c) 2008 Matthew Holmes (matthew@wildfiregames.com), John Anderson (so
 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 
+ * 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;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.IO;
-using System.Text;
-
-using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
 using Prebuild.Core.Nodes;
 using Prebuild.Core.Utilities;
@@ -46,59 +41,59 @@ namespace Prebuild.Core.Targets
         {
                 #region Fields
 
-            readonly Hashtable tools = new Hashtable();
+                readonly Dictionary<string, ToolInfo> tools = new Dictionary<string, ToolInfo>();
                 Kernel kernel;
                 #endregion
 
-        #region Properties
-        /// <summary>
-        /// Gets or sets the solution version.
-        /// </summary>
-        /// <value>The solution version.</value>
-        public abstract string SolutionVersion { get; }
-        /// <summary>
-        /// Gets or sets the product version.
-        /// </summary>
-        /// <value>The product version.</value>
-        public abstract string ProductVersion { get; }
-        /// <summary>
-        /// Gets or sets the schema version.
-        /// </summary>
-        /// <value>The schema version.</value>
-        public abstract string SchemaVersion { get; }
-        /// <summary>
-        /// Gets or sets the name of the version.
-        /// </summary>
-        /// <value>The name of the version.</value>
-        public abstract string VersionName { get; }
-        /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        public abstract VSVersion Version { get; }
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public abstract string Name { get; }
-
-        protected abstract string GetToolsVersionXml(FrameworkVersion version);
-        public abstract string SolutionTag { get; }
-
-        #endregion
+                #region Properties
+                /// <summary>
+                /// Gets or sets the solution version.
+                /// </summary>
+                /// <value>The solution version.</value>
+                public abstract string SolutionVersion { get; }
+                /// <summary>
+                /// Gets or sets the product version.
+                /// </summary>
+                /// <value>The product version.</value>
+                public abstract string ProductVersion { get; }
+                /// <summary>
+                /// Gets or sets the schema version.
+                /// </summary>
+                /// <value>The schema version.</value>
+                public abstract string SchemaVersion { get; }
+                /// <summary>
+                /// Gets or sets the name of the version.
+                /// </summary>
+                /// <value>The name of the version.</value>
+                public abstract string VersionName { get; }
+                /// <summary>
+                /// Gets or sets the version.
+                /// </summary>
+                /// <value>The version.</value>
+                public abstract VSVersion Version { get; }
+                /// <summary>
+                /// Gets the name.
+                /// </summary>
+                /// <value>The name.</value>
+                public abstract string Name { get; }
+
+                protected abstract string GetToolsVersionXml(FrameworkVersion version);
+                public abstract string SolutionTag { get; }
+
+                #endregion
 
                 #region Constructors
 
                 /// <summary>
-        /// Initializes a new instance of the <see cref="VSGenericTarget"/> class.
+                /// Initializes a new instance of the <see cref="VSGenericTarget"/> class.
                 /// </summary>
                 protected VSGenericTarget()
                 {
-                        this.tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
-                        this.tools["Database"] = new ToolInfo("Database", "{4F174C21-8C12-11D0-8340-0000F80270F8}", "dbp", "UNKNOWN");
-                        this.tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
-                        this.tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
-                        this.tools["Folder"] = new ToolInfo("Folder", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", null, null);
+                        tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
+                        tools["Database"] = new ToolInfo("Database", "{4F174C21-8C12-11D0-8340-0000F80270F8}", "dbp", "UNKNOWN");
+                        tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
+                        tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
+                        tools["Folder"] = new ToolInfo("Folder", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", null, null);
                 }
 
                 #endregion
@@ -124,7 +119,7 @@ namespace Prebuild.Core.Targets
                                 }
                                 catch (ArgumentException)
                                 {
-                                        this.kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
+                                        kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
                                 }
                         }
 
@@ -144,7 +139,7 @@ namespace Prebuild.Core.Targets
                 private static ProjectNode FindProjectInSolutionRecursively(string name, SolutionNode solution)
                 {
                         if (solution.ProjectsTable.ContainsKey(name))
-                                return (ProjectNode)solution.ProjectsTable[name];
+                                return solution.ProjectsTable[name];
 
                         foreach (SolutionNode child in solution.Solutions)
                         {
@@ -163,7 +158,7 @@ namespace Prebuild.Core.Targets
                                 throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
                         }
 
-                        ToolInfo toolInfo = (ToolInfo)tools[project.Language];
+                        ToolInfo toolInfo = tools[project.Language];
                         string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
                         StreamWriter ps = new StreamWriter(projectFile);
 
@@ -173,83 +168,83 @@ namespace Prebuild.Core.Targets
                         #region Project File
                         using (ps)
                         {
-                ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" ToolsVersion=\"{0}\">", this.Version == VSVersion.VS10 ? "4.0" : "3.5");
-                                ps.WriteLine("  <PropertyGroup>");
-                                ps.WriteLine("    <ProjectType>Local</ProjectType>");
-                                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", this.ProductVersion);
-                                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", this.SchemaVersion);
-                                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
+                                ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" {0}>", GetToolsVersionXml(project.FrameworkVersion));
+                                ps.WriteLine("  <PropertyGroup>");
+                                ps.WriteLine("    <ProjectType>Local</ProjectType>");
+                                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", ProductVersion);
+                                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", SchemaVersion);
+                                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
 
                                 // Visual Studio has a hard coded guid for the project type
                                 if (project.Type == ProjectType.Web)
-                                        ps.WriteLine("    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>");
-                                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
-                                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
-                                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
-                                ps.WriteLine("    <AssemblyKeyContainerName>");
-                                ps.WriteLine("    </AssemblyKeyContainerName>");
-                                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
+                                        ps.WriteLine("    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>");
+                                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
+                                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
+                                ps.WriteLine("    <AssemblyKeyContainerName>");
+                                ps.WriteLine("    </AssemblyKeyContainerName>");
+                                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
                                 foreach (ConfigurationNode conf in project.Configurations)
                                 {
                                         if (conf.Options.KeyFile != "")
                                         {
-                                                ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
-                                                ps.WriteLine("    <SignAssembly>true</SignAssembly>");
+                                                ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
+                                                ps.WriteLine("    <SignAssembly>true</SignAssembly>");
                                                 break;
                                         }
                                 }
-                                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
-                                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
-                                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
-                                ps.WriteLine("    <DelaySign>false</DelaySign>");
-                                ps.WriteLine("    <TargetFrameworkVersion>{0}</TargetFrameworkVersion>", project.FrameworkVersion.ToString().Replace("_", "."));
-
-                                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type == ProjectType.Web ? ProjectType.Library.ToString() : project.Type.ToString());
-                                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
-                                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
-                                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
-                if (string.IsNullOrEmpty(project.DebugStartParameters))
-                {
-                    ps.WriteLine("    <StartArguments>{0}</StartArguments>", project.DebugStartParameters);
-                }
-                                ps.WriteLine("    <FileUpgradeFlags>");
-                                ps.WriteLine("    </FileUpgradeFlags>");
-
-                                ps.WriteLine("  </PropertyGroup>");
+                                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
+                                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
+                                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
+                                ps.WriteLine("    <DelaySign>false</DelaySign>");
+                                ps.WriteLine("    <TargetFrameworkVersion>{0}</TargetFrameworkVersion>", project.FrameworkVersion.ToString().Replace("_", "."));
+
+                                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type == ProjectType.Web ? ProjectType.Library.ToString() : project.Type.ToString());
+                                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
+                                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
+                                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
+                                if (string.IsNullOrEmpty(project.DebugStartParameters))
+                                {
+                                        ps.WriteLine("    <StartArguments>{0}</StartArguments>", project.DebugStartParameters);
+                                }
+                                ps.WriteLine("    <FileUpgradeFlags>");
+                                ps.WriteLine("    </FileUpgradeFlags>");
+
+                                ps.WriteLine("  </PropertyGroup>");
 
                                 foreach (ConfigurationNode conf in project.Configurations)
                                 {
-                                        ps.Write("  <PropertyGroup ");
-                                        ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \">", conf.Name);
-                                        ps.WriteLine("    <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
-                                        ps.WriteLine("    <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
-                                        ps.WriteLine("    <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
-                                        ps.WriteLine("    <ConfigurationOverrideFile>");
-                                        ps.WriteLine("    </ConfigurationOverrideFile>");
-                                        ps.WriteLine("    <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
-                                        ps.WriteLine("    <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
-                                        ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
-                                        ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
-                                        ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
+                                        ps.Write("      <PropertyGroup ");
+                                        ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|{1}' \">", conf.Name, conf.Platform);
+                                        ps.WriteLine("    <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
+                                        ps.WriteLine("    <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
+                                        ps.WriteLine("    <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
+                                        ps.WriteLine("    <ConfigurationOverrideFile>");
+                                        ps.WriteLine("    </ConfigurationOverrideFile>");
+                                        ps.WriteLine("    <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
+                                        ps.WriteLine("    <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
+                                        ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
+                                        ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
+                                        ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
                                         if (project.Type != ProjectType.Web)
-                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
-                                                        Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
+                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
+                                                             Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
                                         else
-                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
-                                                        Helper.EndPath(Helper.NormalizePath("bin\\")));
-
-                                        ps.WriteLine("    <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
-                                        ps.WriteLine("    <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
-                                        ps.WriteLine("    <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
-                                        ps.WriteLine("    <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
-                                        ps.WriteLine("    <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
-                                        ps.WriteLine("    <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
-                                        ps.WriteLine("  </PropertyGroup>");
+                                                ps.WriteLine("    <OutputPath>{0}</OutputPath>",
+                                                             Helper.EndPath(Helper.NormalizePath("bin\\")));
+
+                                        ps.WriteLine("    <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
+                                        ps.WriteLine("    <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
+                                        ps.WriteLine("    <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
+                                        ps.WriteLine("    <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
+                                        ps.WriteLine("    <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
+                                        ps.WriteLine("    <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
+                                        ps.WriteLine("    <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
+                                        ps.WriteLine("  </PropertyGroup>");
                                 }
 
-                                //ps.WriteLine("      </Settings>");
+                                //ps.WriteLine("          </Settings>");
 
-                            List<ProjectNode> projectReferences = new List<ProjectNode>();
+                                Dictionary<ReferenceNode, ProjectNode> projectReferences = new Dictionary<ReferenceNode, ProjectNode>();
                                 List<ReferenceNode> otherReferences = new List<ReferenceNode>();
 
                                 foreach (ReferenceNode refr in project.References)
@@ -259,57 +254,75 @@ namespace Prebuild.Core.Targets
                                         if (projectNode == null)
                                                 otherReferences.Add(refr);
                                         else
-                                                projectReferences.Add(projectNode);
+                                                projectReferences.Add(refr, projectNode);
                                 }
                                 // Assembly References
-                                ps.WriteLine("  <ItemGroup>");
+                                ps.WriteLine("  <ItemGroup>");
 
                                 foreach (ReferenceNode refr in otherReferences)
                                 {
-                                        ps.Write("    <Reference");
+                                        ps.Write("        <Reference");
                                         ps.Write(" Include=\"");
                                         ps.Write(refr.Name);
                                         ps.WriteLine("\" >");
-                                        ps.Write("        <Name>");
+                                        ps.Write("                <Name>");
                                         ps.Write(refr.Name);
                                         ps.WriteLine("</Name>");
-                                        // TODO: Allow reference to *.exe files
-                    ps.WriteLine("      <Private>{0}</Private>", refr.LocalCopy);
-                                        ps.WriteLine("    </Reference>");
+                                                                                
+                                        if(!String.IsNullOrEmpty(refr.Path))
+                                        {
+                                                // Use absolute path to assembly (for determining assembly type)
+                                                string absolutePath = Path.Combine(project.FullPath, refr.Path);
+                                                if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "exe"))) {
+                                                        // Assembly is an executable (exe)
+                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "exe"));
+                                                } else if(File.Exists(Helper.MakeFilePath(absolutePath, refr.Name, "dll"))) {
+                                                        // Assembly is an library (dll)                                                 
+                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+                                                } else {
+                                                        string referencePath = Helper.MakeFilePath(refr.Path, refr.Name, "dll");
+                                                        kernel.Log.Write(LogType.Warning, "Reference \"{0}\": The specified file doesn't exist.", referencePath);
+                                                        ps.WriteLine("          <HintPath>{0}</HintPath>", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+                                                }
+                                        }
+                                        
+                                        ps.WriteLine("          <Private>{0}</Private>", refr.LocalCopy);
+                                        ps.WriteLine("    </Reference>");
                                 }
-                                ps.WriteLine("  </ItemGroup>");
+                                ps.WriteLine("  </ItemGroup>");
 
                                 //Project References
-                                ps.WriteLine("  <ItemGroup>");
-                                foreach (ProjectNode projectReference in projectReferences)
+                                ps.WriteLine("  <ItemGroup>");
+                                foreach (KeyValuePair<ReferenceNode, ProjectNode> pair in projectReferences)
                                 {
-                                        ToolInfo tool = (ToolInfo)tools[projectReference.Language];
-                    if (tools == null)
-                        throw new UnknownLanguageException();
+                                        ToolInfo tool = tools[pair.Value.Language];
+                                        if (tools == null)
+                                                throw new UnknownLanguageException();
 
-                    string path =
-                        Helper.MakePathRelativeTo(project.FullPath,
-                                                  Helper.MakeFilePath(projectReference.FullPath, projectReference.Name, tool.FileExtension));
-                    ps.WriteLine("    <ProjectReference Include=\"{0}\">", path);
+                                        string path =
+                                                Helper.MakePathRelativeTo(project.FullPath,
+                                                                          Helper.MakeFilePath(pair.Value.FullPath, pair.Value.Name, tool.FileExtension));
+                                        ps.WriteLine("    <ProjectReference Include=\"{0}\">", path);
 
                                         // TODO: Allow reference to visual basic projects
-                                        ps.WriteLine("      <Name>{0}</Name>", projectReference.Name);
-                                        ps.WriteLine("      <Project>{0}</Project>", projectReference.Guid.ToString("B").ToUpper());
-                                        ps.WriteLine("      <Package>{0}</Package>", tool.Guid.ToUpper());
+                                        ps.WriteLine("          <Name>{0}</Name>", pair.Value.Name);
+                                        ps.WriteLine("          <Project>{0}</Project>", pair.Value.Guid.ToString("B").ToUpper());
+                                        ps.WriteLine("          <Package>{0}</Package>", tool.Guid.ToUpper());
 
-                    ps.WriteLine("      <Private>False</Private>" );
+                                        //This is the Copy Local flag in VS
+                                        ps.WriteLine("          <Private>{0}</Private>", pair.Key.LocalCopy);
 
-                                        ps.WriteLine("    </ProjectReference>");
+                                        ps.WriteLine("    </ProjectReference>");
                                 }
-                                ps.WriteLine("  </ItemGroup>");
+                                ps.WriteLine("  </ItemGroup>");
 
-                                //                ps.WriteLine("    </Build>");
-                                ps.WriteLine("  <ItemGroup>");
+                                //                                ps.WriteLine("        </Build>");
+                                ps.WriteLine("  <ItemGroup>");
 
-                                //                ps.WriteLine("      <Include>");
+                                //                                ps.WriteLine("          <Include>");
                                 List<string> list = new List<string>();
 
-                            foreach (string path in project.Files)
+                                foreach (string path in project.Files)
                                 {
                                         string lower = path.ToLower();
                                         if (lower.EndsWith(".resx"))
@@ -318,93 +331,106 @@ namespace Prebuild.Core.Targets
                                                 if (!list.Contains(codebehind))
                                                         list.Add(codebehind);
                                         }
+
                                 }
                                 
-                                foreach (string file in project.Files)
+                                foreach (string filePath in project.Files)
                                 {
                                         //                                      if (file == "Properties\\Bind.Designer.cs")
                                         //                                      {
                                         //                                              Console.WriteLine("Wait a minute!");
                                         //                                              Console.WriteLine(project.Files.GetSubType(file).ToString());
                                         //                                      }
-
-                                        SubType subType = project.Files.GetSubType(file);
+                                        SubType subType = project.Files.GetSubType(filePath);
+                                        
+                                        // Visual Studio chokes on file names if forward slash is used as a path separator
+                                        // instead of backslash.  So we must make sure that all file paths written to the
+                                        // project file use \ as a path separator.
+                                        string file = filePath.Replace(@"/", @"\");
 
                                         if (subType != SubType.Code && subType != SubType.Settings && subType != SubType.Designer
-                                                && subType != SubType.CodeBehind)
+                                            && subType != SubType.CodeBehind)
                                         {
-                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
-                                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file));
-                                                ps.WriteLine("      <SubType>Designer</SubType>");
-                                                ps.WriteLine("    </EmbeddedResource>");
+                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file));
+                                                ps.WriteLine("          <SubType>Designer</SubType>");
+                                                ps.WriteLine("    </EmbeddedResource>");
                                                 //
                                         }
 
                                         if (subType == SubType.Designer)
                                         {
-                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file);
-                                                ps.WriteLine("      <SubType>" + subType + "</SubType>");
-                                                ps.WriteLine("      <Generator>ResXFileCodeGenerator</Generator>");
+                                                ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file);
                                                 
                                                 string autogen_name = file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs";
-                        string dependent_name = file.Substring(0, file.LastIndexOf('.')) + ".cs";
-
-                                                ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", autogen_name);
+                                                string dependent_name = filePath.Substring(0, file.LastIndexOf('.')) + ".cs";
 
-                        // Check for a parent .cs file with the same name as this designer file
-                        if (File.Exists(dependent_name))
-                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
+                                                // Check for a parent .cs file with the same name as this designer file
+                                                if (File.Exists(Helper.NormalizePath(dependent_name)))
+                                                {
+                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
+                                                }
+                                                else
+                                                {
+                                                        ps.WriteLine("          <Generator>ResXFileCodeGenerator</Generator>");
+                                                        ps.WriteLine("          <LastGenOutput>{0}</LastGenOutput>", Path.GetFileName(autogen_name));
+                                                        ps.WriteLine("          <SubType>" + subType + "</SubType>");
+                                                }
                                                 
-                        ps.WriteLine("    </EmbeddedResource>");
-                                                if (File.Exists(autogen_name))
+                                                ps.WriteLine("    </EmbeddedResource>");
+                                                if (File.Exists(Helper.NormalizePath(autogen_name)))
                                                 {
-                                                        ps.WriteLine("    <Compile Include=\"{0}\">", autogen_name);
-                                                        ps.WriteLine("      <AutoGen>True</AutoGen>");
-                                                        ps.WriteLine("      <DesignTime>True</DesignTime>");
-
-                            // If a parent .cs file exists, link this autogen file to it. Otherwise link
-                            // to the designer file
-                            if (File.Exists(dependent_name))
-                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
-                            else
-                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file));
-        
-                            ps.WriteLine("    </Compile>");
+                                                        ps.WriteLine("    <Compile Include=\"{0}\">", autogen_name);
+                                                        //ps.WriteLine("          <DesignTime>True</DesignTime>");
+
+                                                        // If a parent .cs file exists, link this autogen file to it. Otherwise link
+                                                        // to the designer file
+                                                        if (File.Exists(dependent_name))
+                                                        {
+                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(dependent_name));
+                                                        }
+                                                        else
+                                                        {
+                                                                ps.WriteLine("          <AutoGen>True</AutoGen>");
+                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(filePath));
+                                                        }
+                                                        
+                                                        ps.WriteLine("    </Compile>");
                                                 }
                                                 list.Add(autogen_name);
                                         }
                                         if (subType == SubType.Settings)
                                         {
-                                                ps.Write("    <{0} ", project.Files.GetBuildAction(file));
+                                                ps.Write("        <{0} ", project.Files.GetBuildAction(filePath));
                                                 ps.WriteLine("Include=\"{0}\">", file);
-                                                string fileName = Path.GetFileName(file);
-                                                if (project.Files.GetBuildAction(file) == BuildAction.None)
+                                                string fileName = Path.GetFileName(filePath);
+                                                if (project.Files.GetBuildAction(filePath) == BuildAction.None)
                                                 {
-                                                        ps.WriteLine("      <Generator>SettingsSingleFileGenerator</Generator>");
-                                                        ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
+                                                        ps.WriteLine("          <Generator>SettingsSingleFileGenerator</Generator>");
+                                                        ps.WriteLine("          <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
                                                 }
                                                 else
                                                 {
-                                                        ps.WriteLine("      <SubType>Code</SubType>");
-                                                        ps.WriteLine("      <AutoGen>True</AutoGen>");
-                                                        ps.WriteLine("      <DesignTimeSharedInput>True</DesignTimeSharedInput>");
+                                                        ps.WriteLine("          <SubType>Code</SubType>");
+                                                        ps.WriteLine("          <AutoGen>True</AutoGen>");
+                                                        ps.WriteLine("          <DesignTimeSharedInput>True</DesignTimeSharedInput>");
                                                         string fileNameShort = fileName.Substring(0, fileName.LastIndexOf('.'));
                                                         string fileNameShorter = fileNameShort.Substring(0, fileNameShort.LastIndexOf('.'));
-                                                        ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(fileNameShorter + ".settings"));
+                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(fileNameShorter + ".settings"));
                                                 }
-                                                ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
+                                                ps.WriteLine("    </{0}>", project.Files.GetBuildAction(filePath));
                                         }
                                         else if (subType != SubType.Designer)
                                         {
                                                 string path = Helper.NormalizePath(file);
-                        string path_lower = path.ToLower();
+                                                string path_lower = path.ToLower();
 
-                                                if (!list.Contains(file))
+                                                if (!list.Contains(filePath))
                                                 {
-                                                        ps.Write("    <{0} ", project.Files.GetBuildAction(path));
+                                                        ps.Write("        <{0} ", project.Files.GetBuildAction(filePath));
 
                                                         int startPos = 0;
-                                                        if (project.Files.GetPreservePath(file))
+                                                        if (project.Files.GetPreservePath(filePath))
                                                         {
                                                                 while ((@"./\").IndexOf(file.Substring(startPos, 1)) != -1)
                                                                         startPos++;
@@ -415,60 +441,75 @@ namespace Prebuild.Core.Targets
                                                                 startPos = file.LastIndexOf(Path.GetFileName(path));
                                                         }
                                                         
-                                                        ps.WriteLine("Include=\"{0}\">", path);
+                                                        // be sure to write out the path with backslashes so VS recognizes
+                                                        // the file properly.
+                                                        ps.WriteLine("Include=\"{0}\">", file);
 
                                                         int last_period_index = file.LastIndexOf('.');
                                                         string short_file_name = file.Substring(0, last_period_index);
                                                         string extension = Path.GetExtension(path);
-                                                        string designer_format = string.Format(".designer{0}", extension);
+                                                        // make this upper case, so that when File.Exists tests for the
+                                                        // existence of a designer file on a case-sensitive platform,
+                                                        // it is correctly identified.
+                                                        string designer_format = string.Format(".Designer{0}", extension);
 
-                            if (path_lower.EndsWith(designer_format))
+                                                        if (path_lower.EndsWith(designer_format.ToLowerInvariant()))
                                                         {
-                                                                int designer_index = path_lower.IndexOf(designer_format);
+                                                                int designer_index = path.IndexOf(designer_format);
                                                                 string file_name = path.Substring(0, designer_index);
 
-                                                                if (File.Exists(file_name))
-                                                                        ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name));
+                                                                // There are two corrections to the next lines:
+                                                                // 1. Fix the connection between a designer file and a form
+                                                                //        or usercontrol that don't have an associated resx file.
+                                                                // 2. Connect settings files to associated designer files.
+                                                                if (File.Exists(file_name + extension))
+                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + extension));
                                                                 else if (File.Exists(file_name + ".resx"))
-                                                                        ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".resx"));
+                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".resx"));
+                                                                else if (File.Exists(file_name + ".settings"))
+                                                                {
+                                                                        ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(file_name + ".settings"));
+                                                                        ps.WriteLine("          <AutoGen>True</AutoGen>");
+                                                                        ps.WriteLine("          <DesignTimeSharedInput>True</DesignTimeSharedInput>");
+                                                                }
                                                         }
                                                         else if (subType == SubType.CodeBehind)
                                                         {
-                                                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", Path.GetFileName(short_file_name));
+                                                                ps.WriteLine("          <DependentUpon>{0}</DependentUpon>", Path.GetFileName(short_file_name));
                                                         }
-                                                        if (project.Files.GetIsLink(file))
+                                                        if (project.Files.GetIsLink(filePath))
                                                         {
-                                                                string alias = project.Files.GetLinkPath(file);
+                                                                string alias = project.Files.GetLinkPath(filePath);
                                                                 alias += file.Substring(startPos);
                                                                 alias = Helper.NormalizePath(alias);
-                                                                ps.WriteLine("      <Link>{0}</Link>", alias);
+                                                                ps.WriteLine("          <Link>{0}</Link>", alias);
                                                         }
-                                                        else if (project.Files.GetBuildAction(file) != BuildAction.None)
+                                                        else if (project.Files.GetBuildAction(filePath) != BuildAction.None)
                                                         {
-                                                                if (project.Files.GetBuildAction(file) != BuildAction.EmbeddedResource)
+                                                                if (project.Files.GetBuildAction(filePath) != BuildAction.EmbeddedResource)
                                                                 {
-                                                                        ps.WriteLine("      <SubType>{0}</SubType>", subType);
+                                                                        ps.WriteLine("          <SubType>{0}</SubType>", subType);
                                                                 }
                                                         }
 
-                                                        if (project.Files.GetCopyToOutput(file) != CopyToOutput.Never)
+                                                        if (project.Files.GetCopyToOutput(filePath) != CopyToOutput.Never)
                                                         {
-                                                                ps.WriteLine("      <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(file));
+                                                                ps.WriteLine("          <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(filePath));
                                                         }
 
-                                                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
+                                                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(filePath));
                                                 }
                                         }
                                 }
 
-                                ps.WriteLine("  </ItemGroup>");
-                                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
-                                ps.WriteLine("  <PropertyGroup>");
-                                ps.WriteLine("    <PreBuildEvent>");
-                                ps.WriteLine("    </PreBuildEvent>");
-                                ps.WriteLine("    <PostBuildEvent>");
-                                ps.WriteLine("    </PostBuildEvent>");
-                                ps.WriteLine("  </PropertyGroup>");
+                                ps.WriteLine("  </ItemGroup>");
+                                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
+                                ps.WriteLine("  <PropertyGroup>");
+                                ps.WriteLine("    <PreBuildEvent>");
+                                ps.WriteLine("    </PreBuildEvent>");
+                                ps.WriteLine("    <PostBuildEvent>");
+                                ps.WriteLine("    </PostBuildEvent>");
+                                ps.WriteLine("  </PropertyGroup>");
                                 ps.WriteLine("</Project>");
                         }
                         #endregion
@@ -478,23 +519,36 @@ namespace Prebuild.Core.Targets
                         ps = new StreamWriter(projectFile + ".user");
                         using (ps)
                         {
+                                // Get the first configuration from the project.
+                                ConfigurationNode firstConfiguration = null;
+
+                                if (project.Configurations.Count > 0)
+                                {
+                                        firstConfiguration = project.Configurations[0];
+                                }
+
                                 ps.WriteLine("<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
                                 //ps.WriteLine( "<VisualStudioProject>" );
                                 //ps.WriteLine("  <{0}>", toolInfo.XMLTag);
-                                //ps.WriteLine("    <Build>");
-                                ps.WriteLine("  <PropertyGroup>");
-                                //ps.WriteLine("      <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
-                                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
-                                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
-                                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
-                                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", this.ProductVersion);
-                                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
-                                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
-                                ps.WriteLine("  </PropertyGroup>");
+                                //ps.WriteLine("        <Build>");
+                                ps.WriteLine("  <PropertyGroup>");
+                                //ps.WriteLine("          <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
+
+                                if (firstConfiguration != null)
+                                {
+                                        ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">{0}</Configuration>", firstConfiguration.Name);
+                                        ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">{0}</Platform>", firstConfiguration.Platform);
+                                }
+
+                                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
+                                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", ProductVersion);
+                                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
+                                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
+                                ps.WriteLine("  </PropertyGroup>");
                                 foreach (ConfigurationNode conf in project.Configurations)
                                 {
-                                        ps.Write("  <PropertyGroup");
-                                        ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \"", conf.Name);
+                                        ps.Write("      <PropertyGroup");
+                                        ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|{1}' \"", conf.Name, conf.Platform);
                                         ps.WriteLine(" />");
                                 }
                                 ps.WriteLine("</Project>");
@@ -504,9 +558,9 @@ namespace Prebuild.Core.Targets
                         kernel.CurrentWorkingDirectory.Pop();
                 }
 
-            private void WriteSolution(SolutionNode solution, bool writeSolutionToDisk)
+                private void WriteSolution(SolutionNode solution, bool writeSolutionToDisk)
                 {
-                        kernel.Log.Write("Creating {0} solution and project files", this.VersionName);
+                        kernel.Log.Write("Creating {0} solution and project files", VersionName);
 
                         foreach (SolutionNode child in solution.Solutions)
                         {
@@ -531,13 +585,13 @@ namespace Prebuild.Core.Targets
                                 kernel.Log.Write("");
                                 string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
                                 
-                using (StreamWriter ss = new StreamWriter(solutionFile))
-                {
-                    kernel.CurrentWorkingDirectory.Push();
-                    Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
+                                using (StreamWriter ss = new StreamWriter(solutionFile))
+                                {
+                                        kernel.CurrentWorkingDirectory.Push();
+                                        Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
 
-                                        ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
-                    ss.WriteLine(SolutionTag);
+                                        ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", SolutionVersion);
+                                        ss.WriteLine(SolutionTag);
 
                                         WriteProjectDeclarations(ss, solution, solution);
 
@@ -546,7 +600,7 @@ namespace Prebuild.Core.Targets
                                         ss.WriteLine("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution");
                                         foreach (ConfigurationNode conf in solution.Configurations)
                                         {
-                                                ss.WriteLine("\t\t{0}|Any CPU = {0}|Any CPU", conf.Name);
+                                                ss.WriteLine("\t\t{0} = {0}", conf.NameAndPlatform);
                                         }
                                         ss.WriteLine("\tEndGlobalSection");
 
@@ -571,7 +625,7 @@ namespace Prebuild.Core.Targets
                         }
                 }
 
-                private void WriteProjectDeclarations(StreamWriter writer, SolutionNode actualSolution, SolutionNode embeddedSolution)
+                private void WriteProjectDeclarations(TextWriter writer, SolutionNode actualSolution, SolutionNode embeddedSolution)
                 {
                         foreach (SolutionNode childSolution in embeddedSolution.Solutions)
                         {
@@ -595,7 +649,7 @@ namespace Prebuild.Core.Targets
                         }
                 }
 
-                private static void WriteNestedProjectMap(StreamWriter writer, SolutionNode embeddedSolution)
+                private static void WriteNestedProjectMap(TextWriter writer, SolutionNode embeddedSolution)
                 {
                         foreach (ProjectNode project in embeddedSolution.Projects)
                         {
@@ -614,31 +668,31 @@ namespace Prebuild.Core.Targets
                         }
                 }
 
-                private static void WriteNestedProject(StreamWriter writer, SolutionNode solution, Guid projectGuid)
+                private static void WriteNestedProject(TextWriter writer, SolutionNode solution, Guid projectGuid)
                 {
                         WriteNestedFolder(writer, solution.Guid, projectGuid);
                 }
 
-                private static void WriteNestedFolder(StreamWriter writer, Guid parentGuid, Guid childGuid)
+                private static void WriteNestedFolder(TextWriter writer, Guid parentGuid, Guid childGuid)
                 {
                         writer.WriteLine("\t\t{0} = {1}",
-                                childGuid.ToString("B").ToUpper(),
-                                parentGuid.ToString("B").ToUpper());
+                                         childGuid.ToString("B").ToUpper(),
+                                         parentGuid.ToString("B").ToUpper());
                 }
 
-                private static void WriteConfigurationLines(ICollection configurations, SolutionNode solution, StreamWriter ss)
+                private static void WriteConfigurationLines(IEnumerable<ConfigurationNode> configurations, SolutionNode solution, TextWriter ss)
                 {
                         foreach (ProjectNode project in solution.Projects)
                         {
                                 foreach (ConfigurationNode conf in configurations)
                                 {
-                                        ss.WriteLine("\t\t{0}.{1}|Any CPU.ActiveCfg = {1}|Any CPU",
-                                                project.Guid.ToString("B").ToUpper(),
-                                                conf.Name);
+                                        ss.WriteLine("\t\t{0}.{1}.ActiveCfg = {1}",
+                                                     project.Guid.ToString("B").ToUpper(),
+                                                     conf.NameAndPlatform);
 
-                                        ss.WriteLine("\t\t{0}.{1}|Any CPU.Build.0 = {1}|Any CPU",
-                                                project.Guid.ToString("B").ToUpper(),
-                                                conf.Name);
+                                        ss.WriteLine("\t\t{0}.{1}.Build.0 = {1}",
+                                                     project.Guid.ToString("B").ToUpper(),
+                                                     conf.NameAndPlatform);
                                 }
                         }
 
@@ -648,54 +702,37 @@ namespace Prebuild.Core.Targets
                         }
                 }
 
-                private void WriteSolutionFiles(SolutionNode solution, StreamWriter ss)
+                private void WriteSolutionFiles(SolutionNode solution, TextWriter ss)
                 {
-            if (solution.Files != null && solution.Files.Count > 0)
-            {
-                WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
-            }
+                        if(solution.Files != null && solution.Files.Count > 0)
+                                WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
                 }
 
-                private void WriteEmbeddedSolution(StreamWriter writer, SolutionNode embeddedSolution)
+                private void WriteEmbeddedSolution(TextWriter writer, SolutionNode embeddedSolution)
                 {
                         WriteProject(writer, "Folder", embeddedSolution.Guid, embeddedSolution.Name, embeddedSolution.Name, embeddedSolution.Files);
                 }
 
-                private void WriteProject(SolutionNode solution, StreamWriter ss, ProjectNode project)
+                private void WriteProject(SolutionNode solution, TextWriter ss, ProjectNode project)
                 {
                         WriteProject(ss, solution, project.Language, project.Guid, project.Name, project.FullPath);
                 }
 
-                private void WriteProject(SolutionNode solution, StreamWriter ss, DatabaseProjectNode dbProject)
+                private void WriteProject(SolutionNode solution, TextWriter ss, DatabaseProjectNode dbProject)
                 {
                         if (solution.Files != null && solution.Files.Count > 0)
                                 WriteProject(ss, solution, "Database", dbProject.Guid, dbProject.Name, dbProject.FullPath);
                 }
 
-        private static bool ExtensionSpecified(string refName)
-        {
-            return refName.EndsWith(".dll") || refName.EndsWith(".exe");
-        }
-
-        private static string GetProjectExtension(ProjectNode project)
-        {
-            string extension = ".dll";
-            if (project.Type == ProjectType.Exe)
-            {
-                extension = ".exe";
-            }
-            return extension;
-        }
-
                 const string ProjectDeclarationBeginFormat = "Project(\"{0}\") = \"{1}\", \"{2}\", \"{3}\"";
                 const string ProjectDeclarationEndFormat = "EndProject";
 
-                private void WriteProject(StreamWriter ss, SolutionNode solution, string language, Guid guid, string name, string projectFullPath)
+                private void WriteProject(TextWriter ss, SolutionNode solution, string language, Guid guid, string name, string projectFullPath)
                 {
                         if (!tools.ContainsKey(language))
                                 throw new UnknownLanguageException("Unknown .NET language: " + language);
 
-                        ToolInfo toolInfo = (ToolInfo)tools[language];
+                        ToolInfo toolInfo = tools[language];
 
                         string path = Helper.MakePathRelativeTo(solution.FullPath, projectFullPath);
 
@@ -704,23 +741,23 @@ namespace Prebuild.Core.Targets
                         WriteProject(ss, language, guid, name, path);
                 }
 
-                private void WriteProject(StreamWriter writer, string language, Guid projectGuid, string name, string location)
+                private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location)
                 {
                         WriteProject(writer, language, projectGuid, name, location, null);
                 }
 
-                private void WriteProject(StreamWriter writer, string language, Guid projectGuid, string name, string location, FilesNode files)
+                private void WriteProject(TextWriter writer, string language, Guid projectGuid, string name, string location, FilesNode files)
                 {
                         if (!tools.ContainsKey(language))
                                 throw new UnknownLanguageException("Unknown .NET language: " + language);
 
-                        ToolInfo toolInfo = (ToolInfo)tools[language];
+                        ToolInfo toolInfo = tools[language];
 
                         writer.WriteLine(ProjectDeclarationBeginFormat,
-                                toolInfo.Guid,
-                                name,
-                                location,
-                                projectGuid.ToString("B").ToUpper());
+                                         toolInfo.Guid,
+                                         name,
+                                         location,
+                                         projectGuid.ToString("B").ToUpper());
 
                         if (files != null)
                         {
@@ -738,7 +775,7 @@ namespace Prebuild.Core.Targets
                 private void WriteDatabaseProject(SolutionNode solution, DatabaseProjectNode project)
                 {
                         string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "dbp");
-                        IndentedTextWriter ps = new IndentedTextWriter(new StreamWriter(projectFile), "   ");
+                        IndentedTextWriter ps = new IndentedTextWriter(new StreamWriter(projectFile), "   ");
 
                         kernel.CurrentWorkingDirectory.Push();
 
@@ -777,12 +814,10 @@ namespace Prebuild.Core.Targets
                         kernel.CurrentWorkingDirectory.Pop();
                 }
 
-                private bool ContainsSqlFiles(string folder)
+                private static bool ContainsSqlFiles(string folder)
                 {
-                        foreach (string file in Directory.GetFiles(folder, "*.sql"))
-                        {
+                        if(Directory.GetFiles(folder, "*.sql").Length > 0)
                                 return true; // if the folder contains 1 .sql file, that's good enough
-                        }
 
                         foreach (string child in Directory.GetDirectories(folder))
                         {
@@ -793,7 +828,7 @@ namespace Prebuild.Core.Targets
                         return false;
                 }
 
-                private void WriteDatabaseFoldersAndFiles(IndentedTextWriter writer, string folder)
+                private static void WriteDatabaseFoldersAndFiles(IndentedTextWriter writer, string folder)
                 {
                         foreach (string child in Directory.GetDirectories(folder))
                         {
@@ -816,7 +851,7 @@ namespace Prebuild.Core.Targets
                 {
                         kernel.Log.Write("...Cleaning project: {0}", project.Name);
 
-                        ToolInfo toolInfo = (ToolInfo)tools[project.Language];
+                        ToolInfo toolInfo = tools[project.Language];
                         string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
                         string userFile = projectFile + ".user";
 
@@ -826,7 +861,7 @@ namespace Prebuild.Core.Targets
 
                 private void CleanSolution(SolutionNode solution)
                 {
-                        kernel.Log.Write("Cleaning {0} solution and project files", this.VersionName, solution.Name);
+                        kernel.Log.Write("Cleaning {0} solution and project files", VersionName, solution.Name);
 
                         string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
                         string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
diff --git a/Prebuild/src/Core/Targets/VSVersion.cs b/Prebuild/src/Core/Targets/VSVersion.cs
index 59549b0..699b5ca 100644
--- a/Prebuild/src/Core/Targets/VSVersion.cs
+++ b/Prebuild/src/Core/Targets/VSVersion.cs
@@ -45,10 +45,10 @@ namespace Prebuild.Core.Targets
                 /// <summary>
                 /// Visual Studio 2008 
                 /// </summary>
-        VS90,
-        /// <summary>
-        /// Visual Studio 2010
-        /// </summary>
-        VS10
+                VS90,
+                /// <summary>
+                /// Visual Studio 2010 
+                /// </summary>
+                VS10
         }
 }
diff --git a/Prebuild/src/Core/Targets/XcodeTarget.cs b/Prebuild/src/Core/Targets/XcodeTarget.cs
index d96f65b..5393cec 100644
--- a/Prebuild/src/Core/Targets/XcodeTarget.cs
+++ b/Prebuild/src/Core/Targets/XcodeTarget.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.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
diff --git a/Prebuild/src/Core/Utilities/CommandLineCollection.cs b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
index 22752aa..786fa1e 100644
--- a/Prebuild/src/Core/Utilities/CommandLineCollection.cs
+++ b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
@@ -23,10 +23,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.Specialized;
-using System.Diagnostics;
+using System.Collections.Generic;
 
 namespace Prebuild.Core.Utilities
 {    
@@ -34,15 +32,15 @@ namespace Prebuild.Core.Utilities
         /// The CommandLine class parses and interprets the command-line arguments passed to
         /// prebuild.
         /// </summary>
-        public class CommandLineCollection
+        public class CommandLineCollection : IEnumerable<KeyValuePair<string, string>>
         {
                 #region Fields
 
                 // The raw OS arguments
-                private string[] m_RawArgs;
+                private readonly string[] m_RawArgs;
 
                 // Command-line argument storage
-                private Hashtable m_Arguments;
+                private readonly Dictionary<string, string> m_Arguments = new Dictionary<string, string>();
         
                 #endregion
         
@@ -54,8 +52,7 @@ namespace Prebuild.Core.Utilities
                 public CommandLineCollection(string[] args) 
                 {
                         m_RawArgs = args;
-                        m_Arguments = new Hashtable();
-            
+                        
                         Parse();
                 }
 
@@ -69,11 +66,11 @@ namespace Prebuild.Core.Utilities
                                 return;
 
                         int idx = 0;
-                        string arg = null, lastArg = null;
+            string lastArg = null;
 
                         while(idx <m_RawArgs.Length) 
                         {
-                                arg = m_RawArgs[idx];
+                            string arg = m_RawArgs[idx];
 
                                 if(arg.Length > 2 && arg[0] == '/') 
                                 {
@@ -119,16 +116,13 @@ namespace Prebuild.Core.Utilities
                 /// null string if no parameter was specified, and the value if a parameter was specified</remarks>
                 public string this[string index] 
                 {
-                        get 
+                        get
                         {
-                                if(m_Arguments.ContainsKey(index))
+                            if(m_Arguments.ContainsKey(index))
                                 {
-                                        return (string)(m_Arguments[index]);
-                                }
-                                else
-                                {
-                                        return null;
+                                        return (m_Arguments[index]);
                                 }
+                            return null;
                         }
                 }
 
@@ -143,11 +137,16 @@ namespace Prebuild.Core.Utilities
                 /// An <see cref="T:System.Collections.IDictionaryEnumerator"/>
                 /// that can be used to iterate through the collection.
                 /// </returns>
-                public IDictionaryEnumerator GetEnumerator() 
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
                 {
-                        return m_Arguments.GetEnumerator();
+                    return m_Arguments.GetEnumerator();
                 }
 
-                #endregion
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            #endregion
         }
 }
diff --git a/Prebuild/src/Core/Utilities/CurrentDirectory.cs b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
index 5fabdf0..9624c35 100644
--- a/Prebuild/src/Core/Utilities/CurrentDirectory.cs
+++ b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
@@ -24,7 +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.Generic;
 
 namespace Prebuild.Core.Utilities
 {
@@ -35,19 +35,7 @@ namespace Prebuild.Core.Utilities
         {
                 #region Fields
 
-                private Stack m_Stack;
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="CurrentDirectory"/> class.
-                /// </summary>
-                public CurrentDirectory()
-                {
-                        m_Stack = new Stack();
-                }
+                private readonly Stack<string> m_Stack = new Stack<string>();
 
                 #endregion
 
@@ -71,7 +59,7 @@ namespace Prebuild.Core.Utilities
                                 return;
                         }
             
-                        string cwd = (string)m_Stack.Pop();
+                        string cwd = m_Stack.Pop();
                         Helper.SetCurrentDir(cwd);
                 }
 
diff --git a/Prebuild/src/Core/Utilities/Helper.cs b/Prebuild/src/Core/Utilities/Helper.cs
index 9a0d131..8c3e968 100644
--- a/Prebuild/src/Core/Utilities/Helper.cs
+++ b/Prebuild/src/Core/Utilities/Helper.cs
@@ -24,7 +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.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -42,8 +42,6 @@ namespace Prebuild.Core.Utilities
         {
                 #region Fields
 
-                private static Stack dirStack;
-                private static Regex varRegex;
                 static bool checkForOSVariables;
 
                 /// <summary>
@@ -62,60 +60,12 @@ namespace Prebuild.Core.Utilities
                 }
 
                 #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes the <see cref="Helper"/> class.
-                /// </summary>
-                static Helper()
-                {
-                        dirStack = new Stack();
-                        //m_VarRegex = new Regex(@"\${(?<var>[\w|_]+)}");
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public static Stack DirStack
-                {
-                        get
-                        {
-                                return dirStack;
-                        }
-                }
-
-                /// <summary>
-                /// 
-                /// </summary>
-                public static Regex VarRegex
-                {
-                        get
-                        {
-                                return varRegex;
-                        }
-                        set
-                        {
-                                varRegex = value;
-                        }
-                }
-
-                #endregion
         
                 #region Public Methods
 
                 #region String Parsing
-                #region Inner Classes and Delegates
-                /// <summary>
-                /// 
-                /// </summary>
+
                 public delegate string StringLookup(string key);
-                
-                #endregion
 
                 /// <summary>
                 /// Gets a collection of StringLocationPair objects that represent the matches
@@ -545,35 +495,6 @@ namespace Prebuild.Core.Utilities
                         return attrs[0];
                 }
 
-                /* A bit of overhead for simple group parsing, there are problems with Regex in Mono
-                public static string ParseValue(string val)
-                {
-                        if(val == null || val.Length < 1 || !CheckForOSVariables)
-                                return val;
-
-                        string tmp = val;
-                        Match m = m_VarRegex.Match(val);
-                        while(m.Success)
-                        {
-                                if(m.Groups["var"] == null)
-                                        continue;
-
-                                Capture c = m.Groups["var"].Captures[0];
-                                if(c == null)
-                                        continue;
-
-                                string var = c.Value;
-                                string envVal = Environment.GetEnvironmentVariable(var);
-                                if(envVal == null)
-                                        envVal = "";
-
-                                tmp = tmp.Replace("${" + var + "}", envVal);
-                                m = m.NextMatch();
-                        }
-
-                        return tmp;
-                }*/
-
                 /// <summary>
                 /// Attributes the value.
                 /// </summary>
diff --git a/Prebuild/src/Core/Utilities/Log.cs b/Prebuild/src/Core/Utilities/Log.cs
index 548e987..4df3def 100644
--- a/Prebuild/src/Core/Utilities/Log.cs
+++ b/Prebuild/src/Core/Utilities/Log.cs
@@ -82,7 +82,7 @@ namespace Prebuild.Core.Utilities
         {
                 #region Fields
 
-                private StreamWriter m_Writer;
+                private TextWriter m_Writer;
                 private LogTargets m_Target = LogTargets.Null;
                 bool disposed;
 
@@ -96,14 +96,20 @@ namespace Prebuild.Core.Utilities
                 /// <param name="target">The target.</param>
                 /// <param name="fileName">Name of the file.</param>
                 public Log(LogTargets target, string fileName)
-                {
-                        m_Target = target;
-            
-                        if((m_Target & LogTargets.File) != 0)
-                        {
-                                m_Writer = new StreamWriter(fileName, false);
-                        }
-                }
+        {
+            m_Target = target;
+
+            if ((m_Target & LogTargets.File) != 0)
+            {
+                m_Writer = new StreamWriter(fileName, false);
+            }
+            else if ((m_Target & LogTargets.Console) != 0)
+            {
+                // Prevents null reference exceptions when outputing to the log file.
+                // This seems to only happen when running on a network drive.
+                m_Writer = Console.Out;
+            }
+        }
 
                 #endregion
 
diff --git a/Prebuild/src/Core/WarningException.cs b/Prebuild/src/Core/WarningException.cs
index df90dc8..b7c3668 100644
--- a/Prebuild/src/Core/WarningException.cs
+++ b/Prebuild/src/Core/WarningException.cs
@@ -31,7 +31,7 @@ namespace Prebuild.Core
         /// <summary>
         /// 
         /// </summary>
-        [Serializable()]
+        [Serializable]
         public class WarningException : Exception
         {
                 #region Constructors
diff --git a/Prebuild/src/Prebuild.cs b/Prebuild/src/Prebuild.cs
index 2d12b53..081c89c 100644
--- a/Prebuild/src/Prebuild.cs
+++ b/Prebuild/src/Prebuild.cs
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,	EVEN IF	ADVISED	OF THE POSSIBILITY O
 #region CVS     Information
 /*
  * $Source$
- * $Author: jendave $
- * $Date: 2006-09-26 23:43:35 +0200 (ti, 26 sep 2006) $
- * $Revision: 168 $
+ * $Author: kunnis $
+ * $Date: 2009-04-15 02:33:14 +0100 (Wed, 15 Apr 2009) $
+ * $Revision: 308 $
  */
 #endregion
 
@@ -86,17 +86,17 @@ namespace Prebuild
                                 {
                                         kernel.Process();
                                 }
-                        }
-                        catch(Exception ex)     
-                        {
-                                Console.WriteLine("Unhandled error:     {0}", ex.Message);
-                                //#if DEBUG
-                                Console.WriteLine("{0}", ex.StackTrace);
-                                //#endif
-                        }
-                        finally
-                        {
-                                if(kernel.PauseAfterFinish)     
+            }
+#if !DEBUG
+            catch (Exception ex)
+            {
+                Console.WriteLine("Unhandled error:     {0}", ex.Message);
+                Console.WriteLine("{0}", ex.StackTrace);
+            }
+#endif
+            finally
+            {
+                                if(kernel != null && kernel.PauseAfterFinish)   
                                 {
                                         Console.WriteLine("\nPress enter to continue...");
                                         Console.ReadLine();
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index 65c8736..f3ac30f 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -61,16 +61,17 @@ using System.Resources;
 [assembly: AssemblyConfiguration(".NET CLR")]
 [assembly: AssemblyCompany("The Prebuild Project")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright 2004-2008 " +
+[assembly: AssemblyCopyright("Copyright 2004-2010 " +
                              "Matthew Holmes, " +
                              "Dan Moorehead, " +
                              "C.J. Adams-Collier, " +
                              "Rob Loach, " +
-                             "David Hudson,")]
+                             "David Hudson," +
+                             "John Hurliman")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyVersion("2.0.4.*")]
+[assembly: AssemblyVersion("2.0.5.*")]
 
 //
 // Version information for an assembly consists of the following four values:
diff --git a/Prebuild/src/data/prebuild-1.7.xsd b/Prebuild/src/data/prebuild-1.7.xsd
index c3f8d6b..3675503 100644
--- a/Prebuild/src/data/prebuild-1.7.xsd
+++ b/Prebuild/src/data/prebuild-1.7.xsd
@@ -40,7 +40,7 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
-        <xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Solution" minOccurs="1" maxOccurs="unbounded" />
       </xs:sequence>
       <xs:attribute name="version" />
       <xs:attribute name="checkOsVars" />
@@ -57,6 +57,7 @@
         <xs:element ref="Options" minOccurs="0" />
         <xs:element ref="Files" minOccurs="0" />
         <xs:element ref="Project" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Cleanup" minOccurs="0" maxOccurs="1" />
         <xs:element ref="DatabaseProject" minOccurs="0" maxOccurs="unbounded" />
         <xs:element ref="EmbeddedSolution" minOccurs="0" maxOccurs="unbounded" />
       </xs:sequence>
@@ -224,6 +225,7 @@
       </xs:all>
     </xs:complexType>
   </xs:element>
+  
   <xs:element name="Files">
     <xs:complexType>
       <xs:sequence>
@@ -232,6 +234,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  
   <xs:element name="File">
     <xs:complexType>
       <xs:simpleContent>
@@ -275,6 +278,7 @@
       </xs:simpleContent>
     </xs:complexType>
   </xs:element>
+  
   <xs:element name="Match">
     <xs:complexType>
       <xs:sequence>
@@ -322,10 +326,25 @@
       <xs:attribute name="linkPath" type="xs:string" />
     </xs:complexType>
   </xs:element>
+  
   <xs:element name="Exclude">
     <xs:complexType>
       <xs:attribute name="name" type="xs:string" />
       <xs:attribute name="pattern" type="xs:string" />
     </xs:complexType>
   </xs:element>
+
+  <xs:element name="Cleanup">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="CleanFiles" minOccurs="1" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="CleanFiles">
+    <xs:complexType>
+      <xs:attribute name="pattern" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
 </xs:schema>
diff --git a/Prebuild/src/data/prebuild-1.8.xsd b/Prebuild/src/data/prebuild-1.8.xsd
new file mode 100644
index 0000000..8f5c1a4
--- /dev/null
+++ b/Prebuild/src/data/prebuild-1.8.xsd
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.8.xsd" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.8.xsd">
+  <xs:annotation>
+    <xs:documentation>
+      Copyright (c) 2004-2007
+      Matthew Holmes (calefaction at houston . rr . com),
+      Dan Moorehead (dan05a at gmail . com),
+      David Hudson (jendave at  yahoo dot com),
+      C.J. Adams-Collier (cjac at colliertech dot com)
+
+      .NET Prebuild is a cross-platform XML-driven pre-build tool which
+      allows developers to easily generate project or make files for major
+      IDE's and .NET development tools including: Visual Studio .NET 2002,
+      2003, and 2005, SharpDevelop, MonoDevelop, NAnt, Xcode and the GNU Autotools.
+
+      BSD License:
+
+      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.
+    </xs:documentation>
+  </xs:annotation>
+  
+  <xs:element name="Prebuild">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Solution" minOccurs="1" maxOccurs="1" />
+      </xs:sequence>
+      <xs:attribute name="version" />
+      <xs:attribute name="checkOsVars" />
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="Process" type="xs:string" />
+
+  <xs:element name="Solution">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+        <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Options" minOccurs="0" />
+        <xs:element ref="Files" minOccurs="0" />
+        <xs:element ref="Project" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="DatabaseProject" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="EmbeddedSolution" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+      <xs:attribute name="path" type="xs:string" default="" />
+      <xs:attribute name="version" type="xs:string" default="1.0.0" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="EmbeddedSolution">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Files" minOccurs="0" />
+        <xs:element ref="Project" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="DatabaseProject" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="EmbeddedSolution" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+      <xs:attribute name="path" type="xs:string" default="" />
+      <xs:attribute name="version" type="xs:string" default="1.0.0" />
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="DatabaseProject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="DatabaseReference" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="path" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="DatabaseReference">
+    <xs:complexType>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="providerId" type="xs:string" />
+      <xs:attribute name="providerName" type="xs:string" />
+      <xs:attribute name="connectionString" type="xs:string" use="required" />
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="Project">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="Description" type="xs:string" minOccurs="0" maxOccurs="1" />
+        <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+        <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:attribute name="name" type="xs:string" use="required" />
+            <xs:attribute name="path" type="xs:string" />
+            <xs:attribute name="localCopy" type="xs:boolean" />
+            <xs:attribute name="version" type="xs:string" />
+          </xs:complexType>
+        </xs:element>
+        <xs:element ref="Files" />
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="designerFolder" type="xs:string" default="" />
+      <xs:attribute name="filterGroups" type="xs:string" default="" />
+      <xs:attribute name="path" type="xs:string" default="" />
+      <xs:attribute name="icon" type="xs:string" default="" />
+      <xs:attribute name="configFile" type="xs:string" default="" />
+      <xs:attribute name="version" type="xs:string" default="1.0.0" />
+      <xs:attribute name="guid" type="xs:string"/>
+      <xs:attribute name="language" default="C#">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="C#" />
+            <xs:enumeration value="VB.NET" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="type" default="Exe">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="Exe" />
+            <xs:enumeration value="WinExe" />
+            <xs:enumeration value="Library" />
+            <xs:enumeration value="Web" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="runtime" default="Microsoft">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="Microsoft" />
+            <xs:enumeration value="Mono" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="frameworkVersion" default="v2_0">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="v2_0" />
+            <xs:enumeration value="v3_0" />
+            <xs:enumeration value="v3_5" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startupObject" type="xs:string" default="" />
+      <xs:attribute name="rootNamespace" type="xs:string" />
+      <xs:attribute name="assemblyName" type="xs:string" />
+      <xs:attribute name="generateAssemblyInfoFile" type="xs:boolean" default="false" />
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="Configuration">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Options" minOccurs="0" />
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required" />
+      <xs:attribute name="platform" type="xs:string" use="required" />
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Options">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+        <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+        <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+        <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+        <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
+        <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
+        <xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="OnBuildSuccess" />
+              <xs:enumeration value="Always" />
+              <xs:enumeration value="OnOutputUpdated" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="RunScript" type="xs:string" minOccurs="0" />
+        <xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
+        <xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
+        <xs:element name="WarningLevel" minOccurs="0">
+          <xs:simpleType>
+            <xs:restriction base="xs:integer">
+              <xs:minInclusive value="0" />
+              <xs:maxInclusive value="4" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+        <xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
+        <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+        <xs:element name="GenerateDocumentation" type="xs:boolean" minOccurs="0" />
+        <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+        <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+        <xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
+        <xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
+        <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+        <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+        <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+        <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
+        <xs:element name="KeyFile" type="xs:string" minOccurs="0" />
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Files">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="File">
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base="xs:string">
+          <xs:attribute name="resourceName" type="xs:string" default="" />
+          <xs:attribute name="buildAction" default="Compile">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="None" />
+                <xs:enumeration value="Compile" />
+                <xs:enumeration value="Content" />
+                <xs:enumeration value="EmbeddedResource" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="subType" default="Code">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Code" />
+                <xs:enumeration value="CodeBehind" />
+                <xs:enumeration value="Component" />
+                <xs:enumeration value="Form" />
+                <xs:enumeration value="Settings" />
+                <xs:enumeration value="UserControl" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="link" type="xs:boolean" />
+          <xs:attribute name="copyToOutput" default="Never">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Never" />
+                <xs:enumeration value="Always" />
+                <xs:enumeration value="PreserveNewest" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="preservePath" type="xs:boolean" />
+          <xs:attribute name="linkPath" type="xs:string" />
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Match">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Exclude" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:attribute name="path" type="xs:string" />
+      <xs:attribute name="pattern" type="xs:string" use="required" />
+      <xs:attribute name="recurse" type="xs:boolean" default="false" />
+      <xs:attribute name="useRegex" type="xs:boolean" default="false" />
+      <xs:attribute name="buildAction" default="Compile">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="None" />
+            <xs:enumeration value="Compile" />
+            <xs:enumeration value="Content" />
+            <xs:enumeration value="EmbeddedResource" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="resourceName" type="xs:string" default="" />
+      <xs:attribute name="subType" default="Code">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="Code" />
+            <xs:enumeration value="CodeBehind" />
+            <xs:enumeration value="Component" />
+            <xs:enumeration value="Designer" />
+            <xs:enumeration value="Form" />
+            <xs:enumeration value="Settings" />
+            <xs:enumeration value="UserControl" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="link" type="xs:boolean" />
+      <xs:attribute name="copyToOutput" default="Never">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="Never" />
+            <xs:enumeration value="Always" />
+            <xs:enumeration value="PreserveNewest" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="preservePath" type="xs:boolean" />
+      <xs:attribute name="linkPath" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Exclude">
+    <xs:complexType>
+      <xs:attribute name="name" type="xs:string" />
+      <xs:attribute name="pattern" type="xs:string" />
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/Prebuild/src/data/prebuild-1.9.xsd b/Prebuild/src/data/prebuild-1.9.xsd
new file mode 100644
index 0000000..fbca556
--- /dev/null
+++ b/Prebuild/src/data/prebuild-1.9.xsd
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.9.xsd" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.9.xsd">
+        <xs:annotation>
+                <xs:documentation>
+                Copyright (c) 2004-2007
+                Matthew Holmes (calefaction at houston . rr . com),
+                Dan Moorehead (dan05a at gmail . com),
+                David Hudson (jendave at  yahoo dot com),
+                C.J. Adams-Collier (cjac at colliertech dot com)
+                
+                .NET Prebuild is a cross-platform XML-driven pre-build tool which
+                allows developers to easily generate project or make files for major
+                IDE's and .NET development tools including: Visual Studio .NET 2002,
+                2003, and 2005, SharpDevelop, MonoDevelop, NAnt, Xcode and the GNU Autotools.
+                
+                BSD License:
+                
+                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.
+                </xs:documentation>
+        </xs:annotation>
+        
+        <xs:element name="Prebuild">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="Solution" minOccurs="1" maxOccurs="1" />
+                        </xs:sequence>
+                        <xs:attribute name="version" />
+                        <xs:attribute name="checkOsVars" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="Process" type="xs:string" />
+        
+        <xs:element name="Solution">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="Options" minOccurs="0" />
+                                <xs:element ref="Files" minOccurs="0" />
+                                <xs:element ref="Project" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="DatabaseProject" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="EmbeddedSolution" minOccurs="0" maxOccurs="unbounded" />
+                        </xs:sequence>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+                        <xs:attribute name="path" type="xs:string" default="" />
+                        <xs:attribute name="version" type="xs:string" default="1.0.0" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="EmbeddedSolution">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="Files" minOccurs="0" />
+                                <xs:element ref="Project" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="DatabaseProject" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="EmbeddedSolution" minOccurs="0" maxOccurs="unbounded" />
+                        </xs:sequence>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+                        <xs:attribute name="path" type="xs:string" default="" />
+                        <xs:attribute name="version" type="xs:string" default="1.0.0" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="DatabaseProject">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="DatabaseReference" minOccurs="0" maxOccurs="unbounded" />
+                        </xs:sequence>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="path" type="xs:string" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="DatabaseReference">
+                <xs:complexType>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="providerId" type="xs:string" />
+                        <xs:attribute name="providerName" type="xs:string" />
+                        <xs:attribute name="connectionString" type="xs:string" use="required" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="Project">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element name="Description" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                <xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+                                <xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:complexType>
+                                                <xs:attribute name="name" type="xs:string" use="required" />
+                                                <xs:attribute name="path" type="xs:string" />
+                                                <xs:attribute name="localCopy" type="xs:boolean" />
+                                                <xs:attribute name="version" type="xs:string" />
+                                        </xs:complexType>
+                                </xs:element>
+                                <xs:element ref="Files" />
+                        </xs:sequence>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="designerFolder" type="xs:string" default="" />
+                        <xs:attribute name="filterGroups" type="xs:string" default="" />
+                        <xs:attribute name="path" type="xs:string" default="" />
+                        <xs:attribute name="icon" type="xs:string" default="" />
+                        <xs:attribute name="configFile" type="xs:string" default="" />
+                        <xs:attribute name="version" type="xs:string" default="1.0.0" />
+                        <xs:attribute name="guid" type="xs:string"/>
+                        <xs:attribute name="language" default="C#">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="C#" />
+                                                <xs:enumeration value="VB.NET" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="type" default="Exe">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="Exe" />
+                                                <xs:enumeration value="WinExe" />
+                                                <xs:enumeration value="Library" />
+                                                <xs:enumeration value="Web" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="runtime" default="Microsoft">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="Microsoft" />
+                                                <xs:enumeration value="Mono" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="frameworkVersion" default="v2_0">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="v2_0" />
+                                                <xs:enumeration value="v3_0" />
+                                                <xs:enumeration value="v3_5" />
+                                                <xs:enumeration value="v4_0" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="startupObject" type="xs:string" default="" />
+                        <xs:attribute name="rootNamespace" type="xs:string" />
+                        <xs:attribute name="assemblyName" type="xs:string" />
+                        <xs:attribute name="generateAssemblyInfoFile" type="xs:boolean" default="false" />
+                </xs:complexType>
+        </xs:element>
+        
+        <xs:element name="Configuration">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="Options" minOccurs="0" />
+                        </xs:sequence>
+                        <xs:attribute name="name" type="xs:string" use="required" />
+                        <xs:attribute name="platform" type="xs:string" use="required" />
+                </xs:complexType>
+        </xs:element>
+        <xs:element name="Options">
+                <xs:complexType>
+                        <xs:all>
+                                <xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+                                <xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
+                                <xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
+                                <xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
+                                        <xs:simpleType>
+                                                <xs:restriction base="xs:string">
+                                                        <xs:enumeration value="OnBuildSuccess" />
+                                                        <xs:enumeration value="Always" />
+                                                        <xs:enumeration value="OnOutputUpdated" />
+                                                </xs:restriction>
+                                        </xs:simpleType>
+                                </xs:element>
+                                <xs:element name="RunScript" type="xs:string" minOccurs="0" />
+                                <xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
+                                <xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
+                                <xs:element name="WarningLevel" minOccurs="0">
+                                        <xs:simpleType>
+                                                <xs:restriction base="xs:integer">
+                                                        <xs:minInclusive value="0" />
+                                                        <xs:maxInclusive value="4" />
+                                                </xs:restriction>
+                                        </xs:simpleType>
+                                </xs:element>
+                                <xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
+                                <xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+                                <xs:element name="GenerateDocumentation" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+                                <xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+                                <xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+                                <xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
+                                <xs:element name="KeyFile" type="xs:string" minOccurs="0" />
+                        </xs:all>
+                </xs:complexType>
+        </xs:element>
+        <xs:element name="Files">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+                                <xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+                        </xs:sequence>
+                </xs:complexType>
+        </xs:element>
+        <xs:element name="File">
+                <xs:complexType>
+                        <xs:simpleContent>
+                                <xs:extension base="xs:string">
+                                        <xs:attribute name="resourceName" type="xs:string" default="" />
+                                        <xs:attribute name="buildAction" default="Compile">
+                                                <xs:simpleType>
+                                                        <xs:restriction base="xs:string">
+                                                                <xs:enumeration value="None" />
+                                                                <xs:enumeration value="Compile" />
+                                                                <xs:enumeration value="Content" />
+                                                                <xs:enumeration value="EmbeddedResource" />
+                                                                <xs:enumeration value="ApplicationDefinition" />
+                                                                <xs:enumeration value="Page" />
+                                                        </xs:restriction>
+                                                </xs:simpleType>
+                                        </xs:attribute>
+                                        <xs:attribute name="subType" default="Code">
+                                                <xs:simpleType>
+                                                        <xs:restriction base="xs:string">
+                                                                <xs:enumeration value="Code" />
+                                                                <xs:enumeration value="CodeBehind" />
+                                                                <xs:enumeration value="Component" />
+                                                                <xs:enumeration value="Form" />
+                                                                <xs:enumeration value="Settings" />
+                                                                <xs:enumeration value="UserControl" />
+                                                        </xs:restriction>
+                                                </xs:simpleType>
+                                        </xs:attribute>
+                                        <xs:attribute name="link" type="xs:boolean" />
+                                        <xs:attribute name="copyToOutput" default="Never">
+                                                <xs:simpleType>
+                                                        <xs:restriction base="xs:string">
+                                                                <xs:enumeration value="Never" />
+                                                                <xs:enumeration value="Always" />
+                                                                <xs:enumeration value="PreserveNewest" />
+                                                        </xs:restriction>
+                                                </xs:simpleType>
+                                        </xs:attribute>
+                                        <xs:attribute name="preservePath" type="xs:boolean" />
+                                        <xs:attribute name="linkPath" type="xs:string" />
+                                </xs:extension>
+                        </xs:simpleContent>
+                </xs:complexType>
+        </xs:element>
+        <xs:element name="Match">
+                <xs:complexType>
+                        <xs:sequence>
+                                <xs:element ref="Exclude" minOccurs="0" maxOccurs="unbounded" />
+                        </xs:sequence>
+                        <xs:attribute name="path" type="xs:string" />
+                        <xs:attribute name="pattern" type="xs:string" use="required" />
+                        <xs:attribute name="recurse" type="xs:boolean" default="false" />
+                        <xs:attribute name="useRegex" type="xs:boolean" default="false" />
+                        <xs:attribute name="buildAction" default="Compile">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="None" />
+                                                <xs:enumeration value="Compile" />
+                                                <xs:enumeration value="Content" />
+                                                <xs:enumeration value="EmbeddedResource" />
+                                                <xs:enumeration value="ApplicationDefinition" />
+                                                <xs:enumeration value="Page" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="resourceName" type="xs:string" default="" />
+                        <xs:attribute name="subType" default="Code">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="Code" />
+                                                <xs:enumeration value="CodeBehind" />
+                                                <xs:enumeration value="Component" />
+                                                <xs:enumeration value="Designer" />
+                                                <xs:enumeration value="Form" />
+                                                <xs:enumeration value="Settings" />
+                                                <xs:enumeration value="UserControl" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="link" type="xs:boolean" />
+                        <xs:attribute name="copyToOutput" default="Never">
+                                <xs:simpleType>
+                                        <xs:restriction base="xs:string">
+                                                <xs:enumeration value="Never" />
+                                                <xs:enumeration value="Always" />
+                                                <xs:enumeration value="PreserveNewest" />
+                                        </xs:restriction>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attribute name="preservePath" type="xs:boolean" />
+                        <xs:attribute name="linkPath" type="xs:string" />
+                </xs:complexType>
+        </xs:element>
+        <xs:element name="Exclude">
+                <xs:complexType>
+                        <xs:attribute name="name" type="xs:string" />
+                        <xs:attribute name="pattern" type="xs:string" />
+                </xs:complexType>
+        </xs:element>
+</xs:schema>