Skip to content

Commit 41c8306

Browse files
committed
1.4.0-rc2 preparation
1 parent 0832322 commit 41c8306

File tree

6 files changed

+25
-29
lines changed

6 files changed

+25
-29
lines changed

Blocks/nuget/CodeJam.Blocks.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>CodeJam.Blocks</id>
5-
<version>1.4.0-rc1</version>
5+
<version>1.4.0-rc2</version>
66
<title>CodeJam.Blocks Library</title>
77
<authors>Andrew Koryavchenko, ig-sinicyn, Igor Tkachev, rameel</authors>
88
<licenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</licenseUrl>
@@ -13,7 +13,7 @@
1313
<copyright>RSDN, 2017</copyright>
1414
<tags>mapper services csv</tags>
1515
<dependencies>
16-
<dependency id="CodeJam" version="1.4.0-rc1" />
16+
<dependency id="CodeJam" version="1.4.0-rc2" />
1717
</dependencies>
1818
</metadata>
1919
<files>

Blocks/nuget/Readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CodeJam.Blocks 1.4.0-rc1 Release Notes
1+
CodeJam.Blocks 1.4.0-rc2 Release Notes
22
----------------------------------------
33

44
What's new in 1.4.0-rc1

Blocks/src/Mapping/Converter.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,12 @@ public static T ChangeTypeTo<T>(object value, MappingSchema mappingSchema = null
187187
return l(value);
188188
}
189189

190-
internal static bool IsDefaultValuePlaceHolder(Expression expr)
191-
{
192-
var me = expr as MemberExpression;
193-
194-
if (me != null)
195-
{
196-
if (me.Member.Name == "Value" && me.Member.DeclaringType?.IsGenericType == true)
197-
return me.Member.DeclaringType.GetGenericTypeDefinition() == typeof(DefaultValue<>);
198-
}
199-
200-
return expr is DefaultValueExpression;
201-
}
190+
internal static bool IsDefaultValuePlaceHolder(Expression expr) =>
191+
expr is MemberExpression me
192+
&& me.Member.Name == "Value"
193+
&& me.Member.DeclaringType?.IsGenericType == true
194+
? me.Member.DeclaringType.GetGenericTypeDefinition() == typeof(DefaultValue<>)
195+
: expr is DefaultValueExpression;
202196

203197
// public static Type GetDefaultMappingFromEnumType(MappingSchema mappingSchema, Type enumType)
204198
// => ConvertBuilder.GetDefaultMappingFromEnumType(mappingSchema, enumType);

Main/nuget/CodeJam.Main.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>CodeJam</id>
5-
<version>1.4.0-rc1</version>
5+
<version>1.4.0-rc2</version>
66
<title>CodeJam .NET Library</title>
77
<authors>Andrew Koryavchenko, ig-sinicyn, Igor Tkachev, rameel</authors>
88
<licenseUrl>https://github.com/rsdn/CodeJam/blob/master/LICENSE</licenseUrl>

Main/nuget/Readme.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
CodeJam 1.4.0-rc1 Release Notes
1+
CodeJam 1.4.0-rc2 Release Notes
22
---------------------------------
33

4+
What's new in 1.4.0-rc2
5+
-----------------------
6+
* ToLookupDictionary renamed to ToDictionary
7+
* TaskHelper additional overloads
8+
* Refactoring, fixes and code cleanup
9+
410
What's new in 1.4.0-rc1
5-
-------------------------
11+
-----------------------
612
* PathHelpers + IoCode assertions
713
* EnumHelper.GetDisplayName/Description/both
814
* EnumHelper.IsDefined(string)

Main/src/Ranges/[Boundaries]/RangeBoundaryFrom`1.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -517,19 +517,15 @@ public int CompareTo(T other) =>
517517
[Pure]
518518
int IComparable.CompareTo(object obj)
519519
{
520-
// ReSharper disable once MergeCastWithTypeCheck
521-
if (obj is RangeBoundaryFrom<T>)
520+
switch (obj)
522521
{
523-
return CompareTo((RangeBoundaryFrom<T>)obj);
524-
}
525-
526-
// ReSharper disable once MergeCastWithTypeCheck
527-
if (obj is RangeBoundaryTo<T>)
528-
{
529-
return CompareTo((RangeBoundaryTo<T>)obj);
522+
case RangeBoundaryFrom<T> rbf:
523+
return CompareTo(rbf);
524+
case RangeBoundaryTo<T> rbt:
525+
return CompareTo(rbt);
526+
default:
527+
return CompareTo((T)obj);
530528
}
531-
532-
return CompareTo((T)obj);
533529
}
534530
#endregion
535531

0 commit comments

Comments
 (0)