Subversion Repository Public Repository

ConnectionOdbcSdk

Diff Revisions 8 vs 9 for /trunk/ConnectionServer/UnityVersionDetails.cs

Diff revisions: vs.
  @@ -29,10 +29,15 @@
29 29 /// </returns>
30 30 public override string ToString()
31 31 {
32 - if (string.IsNullOrEmpty(Es))
32 + if (string.IsNullOrEmpty(Es) & EsInt<1)
33 33 {
34 34 return string.Format("{0}.{1}({2}.{3})", Major, Minor, Rev, Build);
35 35 }
36 + if (string.IsNullOrEmpty(Es))
37 + {
38 + return string.Format("{0}.{1}({2}.{3}) ES{4}", Major, Minor, Rev, Build, EsInt);
39 + }
40 +
36 41 return string.Format("{0}.{1}({2}.{3}) {4}", Major, Minor, Rev, Build, Es);
37 42 }
38 43
  @@ -53,10 +58,8 @@
53 58 if (this.Major > pMajor
54 59 | this.Major == pMajor & this.Minor > pMinor
55 60 | this.Major == pMajor & this.Minor == pMinor & this.Rev > pRev
56 - | this.Major == pMajor & this.Minor == pMinor & this.Rev == pRev & this.Build >= pBuild
57 - |
58 - this.Major == pMajor & this.Minor == pMinor & this.Rev == pRev & this.Build == pBuild &
59 - this.EsInt >= pEs
61 + | this.Major == pMajor & this.Minor == pMinor & this.Rev == pRev & this.EsInt==0 & this.Build >= pBuild
62 + | this.Major == pMajor & this.Minor == pMinor & this.Rev == pRev & this.Build >= pBuild & this.EsInt >= pEs
60 63 )
61 64 {
62 65 return true;