1.4.0-rc2 preparation

rsdn · Sep 2, 2017 · 41c8306 · 41c8306
1 parent 0832322
commit 41c8306
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 29 deletions.
diff --git a/Blocks/nuget/CodeJam.Blocks.nuspec b/Blocks/nuget/CodeJam.Blocks.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>CodeJam.Blocks</id>
-		<version>1.4.0-rc1</version>
+		<version>1.4.0-rc2</version>
 		<title>CodeJam.Blocks Library</title>
 		<authors>Andrew Koryavchenko, ig-sinicyn, Igor Tkachev, rameel</authors>
 		<licenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</licenseUrl>
@@ -13,7 +13,7 @@
 		<copyright>RSDN, 2017</copyright>
 		<tags>mapper services csv</tags>
 		<dependencies>
-			<dependency id="CodeJam" version="1.4.0-rc1" />
+			<dependency id="CodeJam" version="1.4.0-rc2" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/Blocks/nuget/Readme.txt b/Blocks/nuget/Readme.txt
@@ -1,4 +1,4 @@
-CodeJam.Blocks 1.4.0-rc1 Release Notes
+CodeJam.Blocks 1.4.0-rc2 Release Notes
 ----------------------------------------
 
 What's new in 1.4.0-rc1

diff --git a/Blocks/src/Mapping/Converter.cs b/Blocks/src/Mapping/Converter.cs
@@ -187,18 +187,12 @@ public static T ChangeTypeTo<T>(object value, MappingSchema mappingSchema = null
 			return l(value);
 		}
 
-		internal static bool IsDefaultValuePlaceHolder(Expression expr)
-		{
-			var me = expr as MemberExpression;
-
-			if (me != null)
-			{
-				if (me.Member.Name == "Value" && me.Member.DeclaringType?.IsGenericType == true)
-					return me.Member.DeclaringType.GetGenericTypeDefinition() == typeof(DefaultValue<>);
-			}
-
-			return expr is DefaultValueExpression;
-		}
+		internal static bool IsDefaultValuePlaceHolder(Expression expr) =>
+			expr is MemberExpression me
+					&& me.Member.Name == "Value"
+					&& me.Member.DeclaringType?.IsGenericType == true
+				? me.Member.DeclaringType.GetGenericTypeDefinition() == typeof(DefaultValue<>)
+				: expr is DefaultValueExpression;
 
 //		public static Type GetDefaultMappingFromEnumType(MappingSchema mappingSchema, Type enumType)
 //			=> ConvertBuilder.GetDefaultMappingFromEnumType(mappingSchema, enumType);

diff --git a/Main/nuget/CodeJam.Main.nuspec b/Main/nuget/CodeJam.Main.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>CodeJam</id>
-		<version>1.4.0-rc1</version>
+		<version>1.4.0-rc2</version>
 		<title>CodeJam .NET Library</title>
 		<authors>Andrew Koryavchenko, ig-sinicyn, Igor Tkachev, rameel</authors>
 		<licenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</licenseUrl>

diff --git a/Main/nuget/Readme.txt b/Main/nuget/Readme.txt
@@ -1,8 +1,14 @@
-CodeJam 1.4.0-rc1 Release Notes
+CodeJam 1.4.0-rc2 Release Notes
 ---------------------------------
 
+What's new in 1.4.0-rc2
+-----------------------
+* ToLookupDictionary renamed to ToDictionary
+* TaskHelper additional overloads
+* Refactoring, fixes and code cleanup
+
 What's new in 1.4.0-rc1
--------------------------
+-----------------------
 * PathHelpers + IoCode assertions
 * EnumHelper.GetDisplayName/Description/both
 * EnumHelper.IsDefined(string)

diff --git a/Main/src/Ranges/[Boundaries]/RangeBoundaryFrom`1.cs b/Main/src/Ranges/[Boundaries]/RangeBoundaryFrom`1.cs
@@ -517,19 +517,15 @@ public int CompareTo(T other) =>
 		[Pure]
 		int IComparable.CompareTo(object obj)
 		{
-			// ReSharper disable once MergeCastWithTypeCheck
-			if (obj is RangeBoundaryFrom<T>)
+			switch (obj)
 			{
-				return CompareTo((RangeBoundaryFrom<T>)obj);
-			}
-
-			// ReSharper disable once MergeCastWithTypeCheck
-			if (obj is RangeBoundaryTo<T>)
-			{
-				return CompareTo((RangeBoundaryTo<T>)obj);
+				case RangeBoundaryFrom<T> rbf:
+					return CompareTo(rbf);
+				case RangeBoundaryTo<T> rbt:
+					return CompareTo(rbt);
+				default:
+					return CompareTo((T)obj);
 			}
-
-			return CompareTo((T)obj);
 		}
 		#endregion