use modern language features

Author: michael-damatov

Sources/LambdaConverters.Wpf/Converter.cs

@@ -7,7 +7,7 @@ namespace LambdaConverters
 {
     internal abstract class Converter
     {
-        internal Converter(
+        protected Converter(
             ConverterErrorStrategy errorStrategy,
             object defaultInputTypeValue,
             object defaultOutputTypeValue,

Sources/LambdaConverters.Wpf/LambdaConverters.Wpf.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net46;net45</TargetFrameworks>
     <UseWPF>true</UseWPF>
+    <RootNamespace>LambdaConverters</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>LambdaConverters</PackageId>
     <Version>3.0.0</Version>

Sources/LambdaConverters.Wpf/MultiValueConverterArgs[T,P].IEquatable[MultiValueConverterArgs[T,P]].cs

@@ -32,7 +32,7 @@ public override int GetHashCode()
                 EqualityComparer<P>.Default.GetHashCode(Parameter) ^ (Culture?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is MultiValueConverterArgs<T, P> && Equals((MultiValueConverterArgs<T, P>)obj);
+        public override bool Equals(object obj) => obj is MultiValueConverterArgs<T, P> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(MultiValueConverterArgs<T, P> other) => this == other;

Sources/LambdaConverters.Wpf/MultiValueConverterArgs[T].IEquatable[MultiValueConverterArgs[T]].cs

@@ -30,7 +30,7 @@ public override int GetHashCode()
             => (values?.Aggregate(0, (a, item) => a ^ EqualityComparer<T>.Default.GetHashCode(item)) ?? 0) ^ (Culture?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is MultiValueConverterArgs<T> && Equals((MultiValueConverterArgs<T>)obj);
+        public override bool Equals(object obj) => obj is MultiValueConverterArgs<T> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(MultiValueConverterArgs<T> other) => this == other;

Sources/LambdaConverters.Wpf/TemplateSelectorArgs[T].IEquatable[TemplateSelectorArgs[T]].cs

@@ -25,7 +25,7 @@ partial struct TemplateSelectorArgs<T> : IEquatable<TemplateSelectorArgs<T>>
         public override int GetHashCode() => EqualityComparer<T>.Default.GetHashCode(Item) ^ (Container?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is TemplateSelectorArgs<T> && Equals((TemplateSelectorArgs<T>)obj);
+        public override bool Equals(object obj) => obj is TemplateSelectorArgs<T> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(TemplateSelectorArgs<T> other) => this == other;

Sources/LambdaConverters.Wpf/ValidationRuleArgs[T].IEquatable[ValidationRuleArgs[T]].cs

@@ -25,7 +25,7 @@ partial struct ValidationRuleArgs<T> : IEquatable<ValidationRuleArgs<T>>
         public override int GetHashCode() => EqualityComparer<T>.Default.GetHashCode(Value) ^ (Culture?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is ValidationRuleArgs<T> && Equals((ValidationRuleArgs<T>)obj);
+        public override bool Equals(object obj) => obj is ValidationRuleArgs<T> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(ValidationRuleArgs<T> other) => this == other;

Sources/LambdaConverters.Wpf/ValueConverterArgs[T,P].IEquatable[ValueConverterArgs[T,P]].cs

@@ -28,7 +28,7 @@ public override int GetHashCode()
             => EqualityComparer<T>.Default.GetHashCode(Value) ^ EqualityComparer<P>.Default.GetHashCode(Parameter) ^ (Culture?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is ValueConverterArgs<T, P> && Equals((ValueConverterArgs<T, P>)obj);
+        public override bool Equals(object obj) => obj is ValueConverterArgs<T, P> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(ValueConverterArgs<T, P> other) => this == other;

Sources/LambdaConverters.Wpf/ValueConverterArgs[T].IEquatable[ValueConverterArgs[T]].cs

@@ -25,7 +25,7 @@ partial struct ValueConverterArgs<T> : IEquatable<ValueConverterArgs<T>>
         public override int GetHashCode() => EqualityComparer<T>.Default.GetHashCode(Value) ^ (Culture?.GetHashCode() ?? 0);
 
         /// <inheritdoc />
-        public override bool Equals(object obj) => obj is ValueConverterArgs<T> && Equals((ValueConverterArgs<T>)obj);
+        public override bool Equals(object obj) => obj is ValueConverterArgs<T> args && Equals(args);
 
         /// <inheritdoc />
         public bool Equals(ValueConverterArgs<T> other) => this == other;

Sources/Tests.LambdaConverters.Wpf/MultiValueConverterTests.cs

@@ -32,7 +32,6 @@ public void NoFunctions()
         [TestMethod]
         public void WithSelectFunction()
         {
-
             // with an input value of an unexpected type (use default error strategy)
             Assert.IsNull(TemplateSelector.Create<int>(e => new DataTemplate()).SelectTemplate(true, null));
             Assert.IsNull(TemplateSelector.Create<int>(e => new DataTemplate()).SelectTemplate(null, null));
@@ -68,9 +67,9 @@ public void CompareTemplateSelectorArgs()
                     }).SelectTemplate(1, null));
 
             StructAssert.AreEqual(arg, (x, y) => x == y, (x, y) => x != y);
-            StructAssert.AreNotEqual(arg, default(TemplateSelectorArgs<int>), (x, y) => x == y, (x, y) => x != y);
+            StructAssert.AreNotEqual(arg, default, (x, y) => x == y, (x, y) => x != y);
 
-            new HashSet<TemplateSelectorArgs<int>> { default(TemplateSelectorArgs<int>), arg, arg };
+            new HashSet<TemplateSelectorArgs<int>> { default, arg, arg };
         }
     }
 }