Update of /cvsroot/nant/nant/src/NAnt.Core
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27372/src/NAnt.Core
Modified Files:
ExpressionEvalBase.cs
Log Message:
Added support for relational operators between version values. Use this newly
introduced support to clean-up version checks in our framework configuration
projects.
Mono's resgen(2) only supports /useSourcePath on Mono 1.2.4 and higher. Fixes
bug #1653893.
Index: ExpressionEvalBase.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.Core/ExpressionEvalBase.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ExpressionEvalBase.cs 15 Oct 2006 12:59:01 -0000 1.25
--- ExpressionEvalBase.cs 17 Feb 2007 07:54:06 -0000 1.26
***************
*** 193,196 ****
--- 193,198 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return o.Equals(o2);
+ } else if (o is Version && o2 is Version) {
+ return o.Equals(o2);
} else if (o.GetType().IsEnum) {
if (o2 is string) {
***************
*** 238,241 ****
--- 240,245 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return !o.Equals(o2);
+ } else if (o is Version && o2 is Version) {
+ return !o.Equals(o2);
} else if (o.GetType().IsEnum) {
if (o2 is string) {
***************
*** 284,287 ****
--- 288,293 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return ((IComparable) o).CompareTo(o2) < 0;
+ } else if (o is Version && o2 is Version) {
+ return ((IComparable) o).CompareTo(o2) < 0;
}
***************
*** 318,321 ****
--- 324,329 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return ((IComparable) o).CompareTo(o2) > 0;
+ } else if (o is Version && o2 is Version) {
+ return ((IComparable) o).CompareTo(o2) > 0;
}
***************
*** 352,355 ****
--- 360,365 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return ((IComparable) o).CompareTo(o2) <= 0;
+ } else if (o is Version && o2 is Version) {
+ return ((IComparable) o).CompareTo(o2) <= 0;
}
***************
*** 386,389 ****
--- 396,401 ----
} else if (o is TimeSpan && o2 is TimeSpan) {
return ((IComparable) o).CompareTo(o2) >= 0;
+ } else if (o is Version && o2 is Version) {
+ return ((IComparable) o).CompareTo(o2) >= 0;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
nant-commits mailing list
nant-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nant-commits
