PowerShell · iSazonov · Dec 14, 2022 · Dec 14, 2022 · Dec 14, 2022 · Dec 14, 2022
diff --git a/src/Microsoft.Management.UI.Internal/HelpWindow/ParagraphBuilder.cs b/src/Microsoft.Management.UI.Internal/HelpWindow/ParagraphBuilder.cs
@@ -43,10 +43,7 @@ internal class ParagraphBuilder : INotifyPropertyChanged
         /// <param name="paragraph">Paragraph we will be adding lines to in BuildParagraph.</param>
         internal ParagraphBuilder(Paragraph paragraph)
         {
-            if (paragraph == null)
-            {
-                throw new ArgumentNullException("paragraph");
-            }
+            ArgumentNullException.ThrowIfNull(paragraph);
 
             this.paragraph = paragraph;
             this.boldSpans = new List<TextSpan>();
@@ -185,10 +182,7 @@ internal void HighlightAllInstancesOf(string search, bool caseSensitive, bool wh
         /// <param name="bold">True if the text should be bold.</param>
         internal void AddText(string str, bool bold)
         {
-            if (str == null)
-            {
-                throw new ArgumentNullException("str");
-            }
+            ArgumentNullException.ThrowIfNull(str);
 
             if (str.Length == 0)
             {

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/IntegralConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/IntegralConverter.cs
@@ -31,10 +31,7 @@ public class IntegralConverter : IMultiValueConverter
         /// </returns>
         public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (values == null)
-            {
-                throw new ArgumentNullException("values");
-            }
+            ArgumentNullException.ThrowIfNull(values);
 
             if (values.Length != 2)
             {

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/InverseBooleanConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/InverseBooleanConverter.cs
@@ -22,10 +22,7 @@ public class InverseBooleanConverter : IValueConverter
         /// <returns>The inverted boolean value.</returns>
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
+            ArgumentNullException.ThrowIfNull(value);
 
             var boolValue = (bool)value;
 

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/IsEqualConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/IsEqualConverter.cs
@@ -31,10 +31,7 @@ public class IsEqualConverter : IMultiValueConverter
         /// </returns>
         public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (values == null)
-            {
-                throw new ArgumentNullException("values");
-            }
+            ArgumentNullException.ThrowIfNull(values);
 
             if (values.Length != 2)
             {

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/StringFormatConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/StringFormatConverter.cs
@@ -23,10 +23,7 @@ public class StringFormatConverter : IValueConverter
         /// <returns>The formatted string.</returns>
         public object Convert(object value, Type targetType, Object parameter, CultureInfo culture)
         {
-            if (parameter == null)
-            {
-                throw new ArgumentNullException("parameter");
-            }
+            ArgumentNullException.ThrowIfNull(parameter);
 
             string str = (string)value;
             string formatString = (string)parameter;

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/Utilities.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/Utilities.cs
@@ -83,10 +83,7 @@ public static class Utilities
         /// <exception cref="ArgumentNullException">The specified value is a null reference.</exception>
         public static bool AreAllItemsOfType<T>(IEnumerable items)
         {
-            if (items == null)
-            {
-                throw new ArgumentNullException("items");
-            }
+            ArgumentNullException.ThrowIfNull(items);
 
             foreach (object item in items)
             {
@@ -108,10 +105,7 @@ public static bool AreAllItemsOfType<T>(IEnumerable items)
         /// <exception cref="ArgumentNullException">The specified value is a null reference.</exception>
         public static T Find<T>(this IEnumerable items)
         {
-            if (items == null)
-            {
-                throw new ArgumentNullException("items");
-            }
+            ArgumentNullException.ThrowIfNull(items);
 
             foreach (object item in items)
             {

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/VisualToAncestorDataConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/VisualToAncestorDataConverter.cs
@@ -27,15 +27,9 @@ public class VisualToAncestorDataConverter : IValueConverter
         /// <exception cref="ArgumentNullException">The specified value is a null reference.</exception>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
+            ArgumentNullException.ThrowIfNull(value);
 
-            if (parameter == null)
-            {
-                throw new ArgumentNullException("parameter");
-            }
+            ArgumentNullException.ThrowIfNull(parameter);
 
             Type dataType = (Type)parameter;
 

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/WeakEventListener.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/WeakEventListener.cs
@@ -20,10 +20,7 @@ internal class WeakEventListener<TEventArgs> : IWeakEventListener where TEventAr
         /// <param name="handler">The handler for the event.</param>
         public WeakEventListener(EventHandler<TEventArgs> handler)
         {
-            if (handler == null)
-            {
-                throw new ArgumentNullException("handler");
-            }
+            ArgumentNullException.ThrowIfNull(handler);
 
             this.realHander = handler;
         }

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/WpfHelp.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/WpfHelp.cs
@@ -153,10 +153,7 @@ public bool IsEmpty
         /// <exception cref="NotSupportedException">The specified value does not have a parent that supports removal.</exception>
         public static void RemoveFromParent(FrameworkElement element)
         {
-            if (element == null)
-            {
-                throw new ArgumentNullException("element");
-            }
+            ArgumentNullException.ThrowIfNull(element);
 
             // If the element has already been detached, do nothing \\
             if (element.Parent == null)
@@ -215,10 +212,7 @@ public static void RemoveFromParent(FrameworkElement element)
         /// <exception cref="NotSupportedException">The specified value does not have a parent that supports removal.</exception>
         public static void AddChild(FrameworkElement parent, FrameworkElement element)
         {
-            if (element == null)
-            {
-                throw new ArgumentNullException("element");
-            }
+            ArgumentNullException.ThrowIfNull(element);
 
             if (parent == null)
             {
@@ -310,10 +304,8 @@ public static List<T> FindVisualChildren<T>(DependencyObject obj)
             where T : DependencyObject
         {
             Debug.Assert(obj != null, "obj is null");
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
+
+            ArgumentNullException.ThrowIfNull(obj);
 
             List<T> childrenOfType = new List<T>();
 
@@ -348,10 +340,7 @@ public static List<T> FindVisualChildren<T>(DependencyObject obj)
         public static T FindVisualAncestorData<T>(this DependencyObject obj)
             where T : class
         {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
+            ArgumentNullException.ThrowIfNull(obj);
 
             FrameworkElement parent = obj.FindVisualAncestor<FrameworkElement>();
 
@@ -413,10 +402,7 @@ public static T FindVisualAncestor<T>(this DependencyObject @object) where T : c
         /// <exception cref="ArgumentNullException">The specified value is a null reference.</exception>
         public static bool TryExecute(this RoutedCommand command, object parameter, IInputElement target)
         {
-            if (command == null)
-            {
-                throw new ArgumentNullException("command");
-            }
+            ArgumentNullException.ThrowIfNull(command);
 
             if (command.CanExecute(parameter, target))
             {
@@ -437,10 +423,7 @@ public static bool TryExecute(this RoutedCommand command, object parameter, IInp
         /// <returns>The reference to the child, or null if the template part wasn't found.</returns>
         public static T GetOptionalTemplateChild<T>(Control templateParent, string childName) where T : FrameworkElement
         {
-            if (templateParent == null)
-            {
-                throw new ArgumentNullException("templateParent");
-            }
+            ArgumentNullException.ThrowIfNull(templateParent);
 
             if (string.IsNullOrEmpty(childName))
             {
@@ -566,10 +549,7 @@ public static RoutedPropertyChangedEventArgs<T> CreateRoutedPropertyChangedEvent
         /// <exception cref="ArgumentOutOfRangeException">The specified index is not valid for the specified collection.</exception>
         public static void ChangeIndex(ItemCollection items, object item, int newIndex)
         {
-            if (items == null)
-            {
-                throw new ArgumentNullException("items");
-            }
+            ArgumentNullException.ThrowIfNull(items);
 
             if (!items.Contains(item))
             {

diff --git a/...oft.Management.UI.Internal/ManagementList/CommonControls/ResizerGripThicknessConverter.cs b/...oft.Management.UI.Internal/ManagementList/CommonControls/ResizerGripThicknessConverter.cs
@@ -38,10 +38,7 @@ public ResizerGripThicknessConverter()
         /// <returns>A converted value. If the method returns nullNothingnullptra null reference (Nothing in Visual Basic), the valid null value is used.</returns>
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            if (values == null)
-            {
-                throw new ArgumentNullException("values");
-            }
+            ArgumentNullException.ThrowIfNull(values);
 
             if (object.ReferenceEquals(values[0], DependencyProperty.UnsetValue) ||
                 object.ReferenceEquals(values[1], DependencyProperty.UnsetValue))

diff --git a/...Management.UI.Internal/ManagementList/FilterCore/DefaultFilterRuleCustomizationFactory.cs b/...Management.UI.Internal/ManagementList/FilterCore/DefaultFilterRuleCustomizationFactory.cs
@@ -36,10 +36,7 @@ public override IPropertyValueGetter PropertyValueGetter
 
             set
             {
-                if (value == null)
-                {
-                    throw new ArgumentNullException("value");
-                }
+                ArgumentNullException.ThrowIfNull(value);
 
                 this.propertyValueGetter = value;
             }
@@ -106,15 +103,9 @@ public override ICollection<FilterRule> CreateDefaultFilterRulesForPropertyValue
         /// </param>
         public override void TransferValues(FilterRule oldRule, FilterRule newRule)
         {
-            if (oldRule == null)
-            {
-                throw new ArgumentNullException("oldRule");
-            }
+            ArgumentNullException.ThrowIfNull(oldRule);
 
-            if (newRule == null)
-            {
-                throw new ArgumentNullException("newRule");
-            }
+            ArgumentNullException.ThrowIfNull(newRule);
 
             if (this.TryTransferValuesAsSingleValueComparableValueFilterRule(oldRule, newRule))
             {
@@ -130,10 +121,7 @@ public override void TransferValues(FilterRule oldRule, FilterRule newRule)
         /// </param>
         public override void ClearValues(FilterRule rule)
         {
-            if (rule == null)
-            {
-                throw new ArgumentNullException("rule");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             if (this.TryClearValueFromSingleValueComparableValueFilterRule(rule))
             {
@@ -163,10 +151,7 @@ public override void ClearValues(FilterRule rule)
         /// </returns>
         public override string GetErrorMessageForInvalidValue(string value, Type typeToParseTo)
         {
-            if (typeToParseTo == null)
-            {
-                throw new ArgumentNullException("typeToParseTo");
-            }
+            ArgumentNullException.ThrowIfNull(typeToParseTo);
 
             bool isNumericType = typeToParseTo == typeof(byte)
                 || typeToParseTo == typeof(sbyte)
@@ -222,10 +207,7 @@ private object GetValueFromValidatingValue(FilterRule rule, string propertyName)
             Debug.Assert(rule != null && !string.IsNullOrEmpty(propertyName), "rule and propertyname are not null");
 
             // NOTE: This isn't needed but OACR is complaining
-            if (rule == null)
-            {
-                throw new ArgumentNullException("rule");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             Type ruleType = rule.GetType();
 
@@ -241,10 +223,7 @@ private void SetValueOnValidatingValue(FilterRule rule, string propertyName, obj
             Debug.Assert(rule != null && !string.IsNullOrEmpty(propertyName), "rule and propertyname are not null");
 
             // NOTE: This isn't needed but OACR is complaining
-            if (rule == null)
-            {
-                throw new ArgumentNullException("rule");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             Type ruleType = rule.GetType();
 

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterEvaluator.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterEvaluator.cs
@@ -145,10 +145,7 @@ public FilterExpressionNode FilterExpression
         /// </param>
         public void AddFilterExpressionProvider(IFilterExpressionProvider provider)
         {
-            if (provider == null)
-            {
-                throw new ArgumentNullException("provider");
-            }
+            ArgumentNullException.ThrowIfNull(provider);
 
             this.filterExpressionProviders.Add(provider);
             provider.FilterExpressionChanged += this.FilterProvider_FilterExpressionChanged;
@@ -162,10 +159,7 @@ public void AddFilterExpressionProvider(IFilterExpressionProvider provider)
         /// </param>
         public void RemoveFilterExpressionProvider(IFilterExpressionProvider provider)
         {
-            if (provider == null)
-            {
-                throw new ArgumentNullException("provider");
-            }
+            ArgumentNullException.ThrowIfNull(provider);
 
             this.filterExpressionProviders.Remove(provider);
             provider.FilterExpressionChanged -= this.FilterProvider_FilterExpressionChanged;

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterExceptionEventArgs.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterExceptionEventArgs.cs
@@ -32,10 +32,7 @@ public Exception Exception
         /// </param>
         public FilterExceptionEventArgs(Exception exception)
         {
-            if (exception == null)
-            {
-                throw new ArgumentNullException("exception");
-            }
+            ArgumentNullException.ThrowIfNull(exception);
 
             this.Exception = exception;
         }

diff --git a/...ternal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionAndOperatorNode.cs b/...ternal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionAndOperatorNode.cs
@@ -52,10 +52,7 @@ public FilterExpressionAndOperatorNode()
         /// </param>
         public FilterExpressionAndOperatorNode(IEnumerable<FilterExpressionNode> children)
         {
-            if (children == null)
-            {
-                throw new ArgumentNullException("children");
-            }
+            ArgumentNullException.ThrowIfNull(children);
 
             this.children.AddRange(children);
         }

diff --git a/...I.Internal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionOperandNode.cs b/...I.Internal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionOperandNode.cs
@@ -38,10 +38,7 @@ public FilterRule Rule
         /// </param>
         public FilterExpressionOperandNode(FilterRule rule)
         {
-            if (rule == null)
-            {
-                throw new ArgumentNullException("rule");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             this.Rule = rule;
         }

diff --git a/...nternal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionOrOperatorNode.cs b/...nternal/ManagementList/FilterCore/FilterExpressionNodes/FilterExpressionOrOperatorNode.cs
@@ -52,10 +52,7 @@ public FilterExpressionOrOperatorNode()
         /// </param>
         public FilterExpressionOrOperatorNode(IEnumerable<FilterExpressionNode> children)
         {
-            if (children == null)
-            {
-                throw new ArgumentNullException("children");
-            }
+            ArgumentNullException.ThrowIfNull(children);
 
             this.children.AddRange(children);
         }

diff --git a/...rosoft.Management.UI.Internal/ManagementList/FilterCore/FilterRuleCustomizationFactory.cs b/...rosoft.Management.UI.Internal/ManagementList/FilterCore/FilterRuleCustomizationFactory.cs
@@ -32,10 +32,7 @@ public static FilterRuleCustomizationFactory FactoryInstance
 
             set
             {
-                if (value == null)
-                {
-                    throw new ArgumentNullException("value");
-                }
+                ArgumentNullException.ThrowIfNull(value);
 
                 factoryInstance = value;
             }

diff --git a/...soft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs b/...soft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs
@@ -27,10 +27,7 @@ public static class FilterRuleExtensions
         /// </returns>
         public static FilterRule DeepCopy(this FilterRule rule)
         {
-            if (rule == null)
-            {
-                throw new ArgumentNullException("rule");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             Debug.Assert(rule.GetType().IsSerializable, "rule is serializable");