diff --git a/src/Avalonia.Base/AvaloniaLocator.cs b/src/Avalonia.Base/AvaloniaLocator.cs
index cd398c53ed1..f9bbe38bec8 100644
--- a/src/Avalonia.Base/AvaloniaLocator.cs
+++ b/src/Avalonia.Base/AvaloniaLocator.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Reactive.Disposables;
#pragma warning disable CS1591 // Enable me later
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 35e189e6a4e..7e8d733f1b2 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -5,12 +5,10 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
-using System.Reactive.Disposables;
using System.Reactive.Linq;
using Avalonia.Data;
using Avalonia.Diagnostics;
using Avalonia.Logging;
-using Avalonia.Reactive;
using Avalonia.Threading;
using Avalonia.Utilities;
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index f7dabd3a431..4b0116a5363 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -231,7 +231,7 @@ protected AvaloniaProperty(
}
///
- /// Tests two s for unequality.
+ /// Tests two s for inequality.
///
/// The first property.
/// The second property.
@@ -558,4 +558,4 @@ private class Unset
public override string ToString() => "(unset)";
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 41c2ad6e54b..d5a4e63003f 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -8,7 +8,6 @@
using System.ComponentModel;
using System.Linq;
using Avalonia.Diagnostics;
-using Avalonia.Platform;
namespace Avalonia.Collections
{
@@ -551,4 +550,4 @@ private void NotifyReset(IList t)
NotifyCountChanged();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Collections/AvaloniaListConverter.cs b/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
index 7f5442857c4..63c2e07ecf8 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
@@ -40,4 +40,4 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
return result;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
index b27b06a2777..17319502226 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
@@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Linq;
using System.Reactive.Disposables;
namespace Avalonia.Collections
diff --git a/src/Avalonia.Base/Collections/IAvaloniaList.cs b/src/Avalonia.Base/Collections/IAvaloniaList.cs
index 48c36976a58..b7ed9b1ad64 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaList.cs
@@ -6,7 +6,7 @@
namespace Avalonia.Collections
{
///
- /// A notiftying list.
+ /// A notifying list.
///
/// The type of the items in the list.
public interface IAvaloniaList : IList, IAvaloniaReadOnlyList
@@ -64,4 +64,4 @@ public interface IAvaloniaList : IList, IAvaloniaReadOnlyList
/// The number of items to remove.
void RemoveRange(int index, int count);
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
index 1aa4ff34d50..755efa3eaf1 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
@@ -8,10 +8,10 @@
namespace Avalonia.Collections
{
///
- /// A read-only notiftying list.
+ /// A read-only notifying list.
///
/// The type of the items in the list.
public interface IAvaloniaReadOnlyList : IReadOnlyList, INotifyCollectionChanged, INotifyPropertyChanged
{
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
index 3a355bcb484..ba84c37e4a0 100644
--- a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
+++ b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
@@ -25,7 +25,7 @@ public static IObservable GetWeakCollectionCha
}
///
- /// Subcribes to the CollectionChanged event using a weak subscription.
+ /// Subscribes to the CollectionChanged event using a weak subscription.
///
/// The collection.
///
@@ -44,7 +44,7 @@ public static IDisposable WeakSubscribe(
}
///
- /// Subcribes to the CollectionChanged event using a weak subscription.
+ /// Subscribes to the CollectionChanged event using a weak subscription.
///
/// The collection.
///
diff --git a/src/Avalonia.Base/Data/BindingChainException.cs b/src/Avalonia.Base/Data/BindingChainException.cs
index 97b0d3ba8bc..a609ace4ec2 100644
--- a/src/Avalonia.Base/Data/BindingChainException.cs
+++ b/src/Avalonia.Base/Data/BindingChainException.cs
@@ -6,7 +6,7 @@
namespace Avalonia.Data
{
///
- /// An exception returned through signalling that a
+ /// An exception returned through signaling that a
/// requested binding expression could not be evaluated because of a null in one of the links
/// of the binding chain.
///
@@ -15,14 +15,14 @@ public class BindingChainException : Exception
private string _message;
///
- /// Initalizes a new instance of the class.
+ /// Initializes a new instance of the class.
///
public BindingChainException()
{
}
///
- /// Initalizes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The error message.
public BindingChainException(string message)
@@ -31,7 +31,7 @@ public BindingChainException(string message)
}
///
- /// Initalizes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The error message.
/// The expression.
@@ -51,7 +51,7 @@ public BindingChainException(string message, string expression, string errorPoin
public string Expression { get; protected set; }
///
- /// Gets the point in the expression at which the error occured.
+ /// Gets the point in the expression at which the error occurred.
///
public string ExpressionErrorPoint { get; protected set; }
diff --git a/src/Avalonia.Base/Data/BindingNotification.cs b/src/Avalonia.Base/Data/BindingNotification.cs
index 5d3e6b26f45..7c55321a805 100644
--- a/src/Avalonia.Base/Data/BindingNotification.cs
+++ b/src/Avalonia.Base/Data/BindingNotification.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
-using Avalonia.Logging;
namespace Avalonia.Data
{
diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index eb7c449bec0..ca148659e65 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -20,7 +20,7 @@ public static class BindingOperations
/// An optional anchor from which to locate required context. When binding to objects that
/// are not in the logical tree, certain types of binding need an anchor into the tree in
/// order to locate named controls or resources. The parameter
- /// can be used to provice this context.
+ /// can be used to provide this context.
///
/// An which can be used to cancel the binding.
public static IDisposable Apply(
diff --git a/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs b/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
index d2fb48ffb89..7f4c83772d2 100644
--- a/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
+++ b/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
@@ -1,10 +1,8 @@
-using Avalonia.Utilities;
-using System;
-using System.Collections.Generic;
+using System;
using System.Globalization;
using System.Reflection;
-using System.Text;
using System.Windows.Input;
+using Avalonia.Utilities;
namespace Avalonia.Data.Converters
{
diff --git a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index ec750768924..990a4b04f23 100644
--- a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
@@ -3,9 +3,8 @@
using System;
using System.Globalization;
-using Avalonia.Data;
-using Avalonia.Utilities;
using System.Windows.Input;
+using Avalonia.Utilities;
namespace Avalonia.Data.Converters
{
diff --git a/src/Avalonia.Base/Data/Converters/IValueConverter.cs b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
index b55a2c4fe8e..754aa7975d0 100644
--- a/src/Avalonia.Base/Data/Converters/IValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
@@ -3,7 +3,6 @@
using System;
using System.Globalization;
-using Avalonia.Data;
namespace Avalonia.Data.Converters
{
diff --git a/src/Avalonia.Base/Data/Converters/StringConverters.cs b/src/Avalonia.Base/Data/Converters/StringConverters.cs
index 470f0d22892..0101cf5d295 100644
--- a/src/Avalonia.Base/Data/Converters/StringConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/StringConverters.cs
@@ -1,9 +1,6 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using System;
-using System.Globalization;
-using Avalonia.Utilities;
namespace Avalonia.Data.Converters
{
diff --git a/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
index f7e5de2fe25..28c0dce5182 100644
--- a/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
using System.Reactive.Linq;
-using System.Text;
using Avalonia.Reactive;
namespace Avalonia.Data.Core
diff --git a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
index 0e2c3c035c2..d5658b124bc 100644
--- a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
@@ -1,9 +1,6 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using System;
-using System.Reactive.Linq;
-
namespace Avalonia.Data.Core
{
public class EmptyExpressionNode : ExpressionNode
diff --git a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
index 773049d3a5b..65f26df0117 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
@@ -6,7 +6,6 @@
using System.Linq.Expressions;
using System.Reactive;
using System.Reactive.Linq;
-using Avalonia.Data;
using Avalonia.Data.Core.Parsers;
using Avalonia.Data.Core.Plugins;
using Avalonia.Reactive;
diff --git a/src/Avalonia.Base/Data/Core/ExpressionParseException.cs b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
index 195c9b76605..0365ead24d5 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
-using Avalonia.Data.Core.Parsers;
namespace Avalonia.Data.Core
{
diff --git a/src/Avalonia.Base/Data/Core/ITransformNode.cs b/src/Avalonia.Base/Data/Core/ITransformNode.cs
index 7638db83026..843d09fc199 100644
--- a/src/Avalonia.Base/Data/Core/ITransformNode.cs
+++ b/src/Avalonia.Base/Data/Core/ITransformNode.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Data.Core
+namespace Avalonia.Data.Core
{
interface ITransformNode
{
diff --git a/src/Avalonia.Base/Data/Core/IndexerExpressionNode.cs b/src/Avalonia.Base/Data/Core/IndexerExpressionNode.cs
index 04412b61efe..4206a99e3db 100644
--- a/src/Avalonia.Base/Data/Core/IndexerExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerExpressionNode.cs
@@ -3,8 +3,6 @@
using System.ComponentModel;
using System.Linq.Expressions;
using System.Reflection;
-using System.Text;
-using Avalonia.Data;
namespace Avalonia.Data.Core
{
diff --git a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
index 5c3295a9d8d..5e09bbcc2ff 100644
--- a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
@@ -3,12 +3,8 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Globalization;
using System.Linq;
using System.Reactive.Linq;
-using System.Reflection;
-using System.Text;
-using Avalonia.Data;
using Avalonia.Utilities;
namespace Avalonia.Data.Core
diff --git a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
index 20f1bcd21e6..6d58b18a9fd 100644
--- a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
+++ b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
@@ -3,7 +3,6 @@
using System;
using System.Globalization;
-using Avalonia.Data;
namespace Avalonia.Data.Core
{
diff --git a/src/Avalonia.Base/Data/Core/Parsers/ExpressionTreeParser.cs b/src/Avalonia.Base/Data/Core/Parsers/ExpressionTreeParser.cs
index db5d1176874..d2035a592f2 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/ExpressionTreeParser.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ExpressionTreeParser.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
using System.Linq.Expressions;
-using System.Text;
namespace Avalonia.Data.Core.Parsers
{
diff --git a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
index 1b4d1c200da..bcb6eeca414 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
-using System.Text;
namespace Avalonia.Data.Core.Parsers
{
diff --git a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index ee91f964ffb..8d2ed905ee6 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -2,9 +2,7 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
-using System.Linq;
using System.Reactive.Linq;
-using Avalonia.Data;
namespace Avalonia.Data.Core.Plugins
{
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
index 47e4d91e137..33c40abea8d 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
@@ -6,7 +6,6 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
-using Avalonia.Data;
namespace Avalonia.Data.Core.Plugins
{
@@ -31,7 +30,7 @@ public IPropertyAccessor Start(WeakReference reference, string name, IPropertyAc
return new Accessor(reference, name, inner);
}
- private class Accessor : DataValidatiorBase
+ private class Accessor : DataValidationBase
{
private ValidationContext _context;
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs b/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
similarity index 95%
rename from src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs
rename to src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
index 03ab7712bdf..faec981eedf 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
@@ -15,15 +15,15 @@ namespace Avalonia.Data.Core.Plugins
/// and convert any values received from the inner property accessor into
/// s.
///
- public abstract class DataValidatiorBase : PropertyAccessorBase, IObserver