From 69b3a8a9b84a0fb1918f728e27a92ab52128ae3c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 13 Jun 2007 19:58:57 +0000 Subject: * First attempt at fixing differing build files on different .net flavours. * And, as always, some bin ignores --- Prebuild/src/Core/Nodes/ConfigurationNode.cs | 14 ++++++++++++-- Prebuild/src/Core/Nodes/FilesNode.cs | 3 ++- Prebuild/src/Core/Nodes/ProjectNode.cs | 14 ++++++++++---- Prebuild/src/Core/Nodes/ReferenceNode.cs | 14 ++++++++++++-- Prebuild/src/Core/Nodes/ReferencePathNode.cs | 14 ++++++++++++-- 5 files changed, 48 insertions(+), 11 deletions(-) (limited to 'Prebuild/src/Core') diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs index e1488a7..390794f 100644 --- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs +++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs @@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes /// /// [DataNode("Configuration")] - public class ConfigurationNode : DataNode, ICloneable + public class ConfigurationNode : DataNode, ICloneable, IComparable { #region Fields @@ -173,5 +173,15 @@ namespace Prebuild.Core.Nodes } #endregion - } + + #region IComparable Members + + public int CompareTo(object obj) + { + ConfigurationNode that = (ConfigurationNode) obj; + return this.m_Name.CompareTo(that.m_Name); + } + + #endregion + } } diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs index 442a45f..d31307b 100644 --- a/Prebuild/src/Core/Nodes/FilesNode.cs +++ b/Prebuild/src/Core/Nodes/FilesNode.cs @@ -218,5 +218,6 @@ namespace Prebuild.Core.Nodes } #endregion - } + + } } diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs index 84d9f5d..5f03c4d 100644 --- a/Prebuild/src/Core/Nodes/ProjectNode.cs +++ b/Prebuild/src/Core/Nodes/ProjectNode.cs @@ -290,7 +290,9 @@ namespace Prebuild.Core.Nodes { get { - return m_Configurations.Values; + ArrayList tmp = new ArrayList( ConfigurationsTable.Values); + tmp.Sort(); + return tmp; } } @@ -314,8 +316,10 @@ namespace Prebuild.Core.Nodes { get { - return m_ReferencePaths; - } + ArrayList tmp = new ArrayList(m_ReferencePaths); + tmp.Sort(); + return tmp; + } } /// @@ -326,7 +330,9 @@ namespace Prebuild.Core.Nodes { get { - return m_References; + ArrayList tmp = new ArrayList(m_References); + tmp.Sort(); + return tmp; } } diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs index beb50dc..a2880c0 100644 --- a/Prebuild/src/Core/Nodes/ReferenceNode.cs +++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs @@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes /// /// [DataNode("Reference")] - public class ReferenceNode : DataNode + public class ReferenceNode : DataNode, IComparable { #region Fields @@ -139,5 +139,15 @@ namespace Prebuild.Core.Nodes } #endregion - } + + #region IComparable Members + + public int CompareTo(object obj) + { + ReferenceNode that = (ReferenceNode)obj; + return this.m_Name.CompareTo(that.m_Name); + } + + #endregion + } } diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs index 5d98dda..0563c1b 100644 --- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs +++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs @@ -47,7 +47,7 @@ namespace Prebuild.Core.Nodes /// /// [DataNode("ReferencePath")] - public class ReferencePathNode : DataNode + public class ReferencePathNode : DataNode, IComparable { #region Fields @@ -94,5 +94,15 @@ namespace Prebuild.Core.Nodes } #endregion - } + + #region IComparable Members + + public int CompareTo(object obj) + { + ReferencePathNode that = (ReferencePathNode)obj; + return this.m_Path.CompareTo(that.m_Path); + } + + #endregion + } } -- cgit v1.1