From 75d59d28a6bce51aa6f584f3184ae922682d9dd5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 9 Feb 2021 11:57:13 +0100
Subject: [PATCH] Remove Contract usages.

---
 src/Markup/Avalonia.Markup/Data/Binding.cs          |  3 ++-
 src/Markup/Avalonia.Markup/Data/BindingBase.cs      | 13 +++++++------
 .../Markup/Parsers/ExpressionObserverBuilder.cs     |  5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index 554c27b85a..71d2050e9e 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -63,7 +63,8 @@ namespace Avalonia.Data
 
         protected override ExpressionObserver CreateExpressionObserver(IAvaloniaObject target, AvaloniaProperty targetProperty, object? anchor, bool enableDataValidation)
         {
-            Contract.Requires<ArgumentNullException>(target is not null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
             anchor = anchor ?? DefaultAnchor?.Target;
             
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
diff --git a/src/Markup/Avalonia.Markup/Data/BindingBase.cs b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
index b900a043d7..c25ef49167 100644
--- a/src/Markup/Avalonia.Markup/Data/BindingBase.cs
+++ b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
@@ -87,7 +87,8 @@ namespace Avalonia.Data
             object? anchor = null,
             bool enableDataValidation = false)
         {
-            Contract.Requires<ArgumentNullException>(target != null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
             anchor = anchor ?? DefaultAnchor?.Target;
 
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
@@ -135,7 +136,7 @@ namespace Avalonia.Data
             bool targetIsDataContext,
             object? anchor)
         {
-            Contract.Requires<ArgumentNullException>(target != null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
 
             if (!(target is IDataContextProvider))
             {
@@ -166,7 +167,7 @@ namespace Avalonia.Data
             string elementName,
             ExpressionNode node)
         {
-            Contract.Requires<ArgumentNullException>(target != null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
 
             if (NameScope is null || !NameScope.TryGetTarget(out var scope) || scope is null)
                 throw new InvalidOperationException("Name scope is null or was already collected");
@@ -182,7 +183,7 @@ namespace Avalonia.Data
             RelativeSource relativeSource,
             ExpressionNode node)
         {
-            Contract.Requires<ArgumentNullException>(target != null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
 
             IObservable<object?> controlLocator;
 
@@ -214,7 +215,7 @@ namespace Avalonia.Data
             object source,
             ExpressionNode node)
         {
-            Contract.Requires<ArgumentNullException>(source != null);
+            _ = source ?? throw new ArgumentNullException(nameof(source));
 
             return new ExpressionObserver(source, node);
         }
@@ -223,7 +224,7 @@ namespace Avalonia.Data
             IAvaloniaObject target,
             ExpressionNode node)
         {
-            Contract.Requires<ArgumentNullException>(target is not null);
+            _ = target ?? throw new ArgumentNullException(nameof(target));
 
             var result = new ExpressionObserver(
                 () => target.GetValue(StyledElement.TemplatedParentProperty),
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
index e615923ff0..ebdad881c3 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
@@ -48,7 +48,8 @@ namespace Avalonia.Markup.Parsers
             string? description = null,
             Func<string, string, Type>? typeResolver = null)
         {
-            Contract.Requires<ArgumentNullException>(rootObservable != null);
+            _ = rootObservable ?? throw new ArgumentNullException(nameof(rootObservable));
+
             return new ExpressionObserver(
                 rootObservable,
                 Parse(expression, enableDataValidation, typeResolver).Node,
@@ -64,7 +65,7 @@ namespace Avalonia.Markup.Parsers
             string? description = null,
             Func<string, string, Type>? typeResolver = null)
         {
-            Contract.Requires<ArgumentNullException>(rootGetter != null);
+            _ = rootGetter ?? throw new ArgumentNullException(nameof(rootGetter));
 
             return new ExpressionObserver(
                 rootGetter,