Version bump + minor cleanup and coverage fix.

jwaliszko · Aug 18, 2016 · 071b2b1 · 071b2b1
1 parent 4b6f5f6
commit 071b2b1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 21 deletions.
diff --git a/src/ExpressiveAnnotations.MvcUnobtrusive/Properties/AssemblyInfo.cs b/src/ExpressiveAnnotations.MvcUnobtrusive/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.8.0")]
-[assembly: AssemblyFileVersion("2.4.8.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
diff --git a/src/ExpressiveAnnotations.MvcWebSample/Models/Query.cs b/src/ExpressiveAnnotations.MvcWebSample/Models/Query.cs
@@ -84,7 +84,7 @@ public Query()
         [RequiredIf(@"GoAbroad == true
                       && (
                              (NextCountry != 'Other' && NextCountry == Country)
-                             || (Age > 24 && Age <= 55)
+                             || (Age > 24 && 55 >= Age)
                          )",
             ErrorMessageResourceType = typeof (Resources), ErrorMessageResourceName = nameof(Resources.ReasonForTravelRequired))]
         [RequiredIf("ArrayContains(Age, [15, 16, 17])", // alternative without array literal: ArrayContains(Age, EarlyYears)",

diff --git a/src/ExpressiveAnnotations.MvcWebSample/Views/Home/EditorTemplates/Query.cshtml b/src/ExpressiveAnnotations.MvcWebSample/Views/Home/EditorTemplates/Query.cshtml
@@ -68,7 +68,7 @@
 [RequiredIf(@@"GoAbroad == true
               && (
                      (NextCountry != 'Other' && NextCountry == Country)
-                     || (Age > 24 && Age &le; 55)
+                     || (Age > 24 && 55 &ge; Age)
                  )")]
 [RequiredIf("ArrayContains(Age, [15, 16, 17])")] @*alternative: [RequiredIf("ArrayContains(Age, EarlyYears)")]*@
 [AssertThat(@@"ReasonForTravel != 'John\'s cat named ""\\\'""\n (Backslash Quote)' && ReasonForTravel != SIMONS_CAT")]

diff --git a/src/ExpressiveAnnotations/Analysis/Expr.cs b/src/ExpressiveAnnotations/Analysis/Expr.cs
@@ -361,21 +361,6 @@ public Expression OnesComplement(Expression arg, Token oper)
             }
         }
 
-        public Expression Convert(Expression arg, Type type, Location pos)
-        {
-            if (arg.Type == typeof (bool))
-                return arg;
-
-            try
-            {
-                return Expression.Convert(arg, type);
-            }
-            catch
-            {
-                throw new ParseErrorException($"Cannot implicitly convert type '{arg.Type}' to '{type}'.", ExprString, pos);
-            }
-        }
-
         public Expression Condition(Expression arg1, Expression arg2, Expression arg3, Token start, Token oper)
         {
             Wall.OfType<bool>(arg1, start.Location);

diff --git a/src/ExpressiveAnnotations/Properties/AssemblyInfo.cs b/src/ExpressiveAnnotations/Properties/AssemblyInfo.cs
@@ -42,5 +42,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.0.0")]
-[assembly: AssemblyFileVersion("2.6.0.0")]
+[assembly: AssemblyVersion("2.7.0.0")]
+[assembly: AssemblyFileVersion("2.7.0.0")]