* Changed some more sort order issues

* Updated vs2005 files as well

3 files changed, 52 insertions, 38 deletions

diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 5f03c4d..c56dacc 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -81,7 +81,7 @@ namespace Prebuild.Core.Nodes
         /// 

         /// </summary>

         [DataNode("Project")]

-        public class ProjectNode : DataNode

+        public class ProjectNode : DataNode, IComparable

         {

                 #region Fields

 

@@ -496,5 +496,15 @@ namespace Prebuild.Core.Nodes
 

 

                 #endregion

-        }

+

+        #region IComparable Members

+

+        public int CompareTo(object obj)

+        {

+            ProjectNode that = (ProjectNode)obj;

+            return this.m_Name.CompareTo(that.m_Name);

+        }

+

+        #endregion

+    }

 }

diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
index 0121075..c777fa4 100644
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -165,8 +165,10 @@ namespace Prebuild.Core.Nodes
                 {

                         get

                         {

-                                return m_Configurations.Values;

-                        }

+                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);

+                tmp.Sort();

+                return tmp;

+            }

                 }

 

                 /// <summary>

@@ -189,7 +191,9 @@ namespace Prebuild.Core.Nodes
                 {

                         get

                         {

-                                return m_Projects.Values;

+                ArrayList tmp = new ArrayList(m_Projects.Values);

+                tmp.Sort();

+                return tmp;

                         }

                 }

 

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index df6b4f4..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -9,7 +9,7 @@
     <ApplicationIcon>App.ico</ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>prebuild</AssemblyName>

+    <AssemblyName>Prebuild</AssemblyName>

     <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile>

     <SignAssembly>true</SignAssembly>

     <DefaultClientScript>JScript</DefaultClientScript>

@@ -60,6 +60,10 @@
     <NoWarn>1595</NoWarn>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

     <Reference Include="System.EnterpriseServices" >

       <HintPath>System.EnterpriseServices.dll</HintPath>

       <Private>False</Private>

@@ -68,10 +72,6 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

@@ -83,6 +83,9 @@
     <Compile Include="Prebuild.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Core\FatalException.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Core\Kernel.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -92,25 +95,19 @@
     <Compile Include="Core\WarningException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\FatalException.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Core\Interfaces\ITarget.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Core\Interfaces\IDataNode.cs">

+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">

+    <Compile Include="Core\Attributes\TargetAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Attributes\TargetAttribute.cs">

+    <Compile Include="Core\Interfaces\IDataNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ProjectNode.cs">

+    <Compile Include="Core\Interfaces\ITarget.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\ConfigurationNode.cs">

@@ -122,73 +119,76 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\OptionsNode.cs">

+    <Compile Include="Core\Nodes\FileNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\ReferencePathNode.cs">

+    <Compile Include="Core\Nodes\FilesNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\MatchNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\SolutionNode.cs">

+    <Compile Include="Core\Nodes\OptionsNode.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Nodes\ProcessNode.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Core\Nodes\ProjectNode.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Core\Nodes\ReferenceNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\FileNode.cs">

+    <Compile Include="Core\Nodes\ReferencePathNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Nodes\FilesNode.cs">

+    <Compile Include="Core\Nodes\SolutionNode.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\DebugTarget.cs">

+    <Compile Include="Core\Parse\IfContext.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

+    <Compile Include="Core\Parse\Preprocessor.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\AutotoolsTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

+    <Compile Include="Core\Targets\DebugTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2002Target.cs">

+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2003Target.cs">

+    <Compile Include="Core\Targets\NAntTarget.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Core\Targets\SharpDevelop2Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\VS2005Target.cs">

+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Targets\NAntTarget.cs">

+    <Compile Include="Core\Targets\VS2002Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\IfContext.cs">

+    <Compile Include="Core\Targets\VS2003Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Parse\Preprocessor.cs">

+    <Compile Include="Core\Targets\VS2005Target.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\Helper.cs">

+    <Compile Include="Core\Utilities\CommandLineCollection.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\Log.cs">

+    <Compile Include="Core\Utilities\CurrentDirectory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\CommandLineCollection.cs">

+    <Compile Include="Core\Utilities\Helper.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Core\Utilities\CurrentDirectory.cs">

+    <Compile Include="Core\Utilities\Log.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">