diff --git a/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs b/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs
index 6965fa6e3b5..e6549b39d22 100644
--- a/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs
+++ b/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs
@@ -73,7 +73,7 @@ private static void VerifyHandler(object handler)
/// The original event with handler added.
private object InPlaceAdd(object handler)
{
- Requires.NotNull(handler, nameof(handler));
+ Requires.NotNull(handler);
VerifyHandler(handler);
ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, true);
@@ -88,7 +88,7 @@ private object InPlaceAdd(object handler)
/// The original event with handler removed.
private object InPlaceSubtract(object handler)
{
- Requires.NotNull(handler, nameof(handler));
+ Requires.NotNull(handler);
VerifyHandler(handler);
ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, false);
diff --git a/src/System.Management.Automation/engine/ComInterop/ComBinder.cs b/src/System.Management.Automation/engine/ComInterop/ComBinder.cs
index 37a52498e7f..a88abc09f1e 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComBinder.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComBinder.cs
@@ -35,8 +35,8 @@ public static bool IsComObject(object value)
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject instance, out DynamicMetaObject result, bool delayInvocation)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
if (TryGetMetaObject(ref instance))
{
@@ -66,9 +66,9 @@ public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject in
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject instance, DynamicMetaObject value, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
- Requires.NotNull(value, nameof(value));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
+ Requires.NotNull(value);
if (TryGetMetaObject(ref instance))
{
@@ -91,9 +91,9 @@ public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject in
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
- Requires.NotNull(args, nameof(args));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
+ Requires.NotNull(args);
if (TryGetMetaObjectInvoke(ref instance))
{
@@ -116,9 +116,9 @@ public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProperty, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
- Requires.NotNull(args, nameof(args));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
+ Requires.NotNull(args);
if (TryGetMetaObject(ref instance))
{
@@ -158,9 +158,9 @@ public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProp
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
- Requires.NotNull(args, nameof(args));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
+ Requires.NotNull(args);
if (TryGetMetaObjectInvoke(ref instance))
{
@@ -183,10 +183,10 @@ public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject inst
/// True if operation was bound successfully; otherwise, false.
public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, DynamicMetaObject value, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
- Requires.NotNull(args, nameof(args));
- Requires.NotNull(value, nameof(value));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
+ Requires.NotNull(args);
+ Requires.NotNull(value);
if (TryGetMetaObjectInvoke(ref instance))
{
@@ -208,8 +208,8 @@ public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject inst
/// True if operation was bound successfully; otherwise, false.
public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance, out DynamicMetaObject result)
{
- Requires.NotNull(binder, nameof(binder));
- Requires.NotNull(instance, nameof(instance));
+ Requires.NotNull(binder);
+ Requires.NotNull(instance);
if (IsComObject(instance.Value))
{
@@ -245,7 +245,7 @@ public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance,
/// The collection of member names.
internal static IList GetDynamicDataMemberNames(object value)
{
- Requires.NotNull(value, nameof(value));
+ Requires.NotNull(value);
Requires.Condition(IsComObject(value), nameof(value));
return ComObject.ObjectToComObject(value).GetMemberNames(true);
@@ -260,7 +260,7 @@ internal static IList GetDynamicDataMemberNames(object value)
/// The collection of pairs that represent data member's names and their data.
internal static IList> GetDynamicDataMembers(object value, IEnumerable names)
{
- Requires.NotNull(value, nameof(value));
+ Requires.NotNull(value);
Requires.Condition(IsComObject(value), nameof(value));
return ComObject.ObjectToComObject(value).GetMembers(names);
diff --git a/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs
index 758281c7ac4..8a6e81f0800 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs
@@ -23,31 +23,31 @@ internal ComFallbackMetaObject(Expression expression, BindingRestrictions restri
public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.FallbackGetIndex(UnwrapSelf(), indexes);
}
public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.FallbackSetIndex(UnwrapSelf(), indexes, value);
}
public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.FallbackGetMember(UnwrapSelf());
}
public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.FallbackInvokeMember(UnwrapSelf(), args);
}
public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.FallbackSetMember(UnwrapSelf(), value);
}
diff --git a/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs
index bc75f83ba0a..39c9d1dbe05 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs
@@ -16,37 +16,37 @@ internal ComMetaObject(Expression expression, BindingRestrictions restrictions,
public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(args.AddFirst(WrapSelf()));
}
public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(args.AddFirst(WrapSelf()));
}
public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(WrapSelf());
}
public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(WrapSelf(), value);
}
public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(WrapSelf(), indexes);
}
public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return binder.Defer(WrapSelf(), indexes.AddLast(value));
}
diff --git a/src/System.Management.Automation/engine/ComInterop/Helpers.cs b/src/System.Management.Automation/engine/ComInterop/Helpers.cs
index 814e93825a7..a780e095e20 100644
--- a/src/System.Management.Automation/engine/ComInterop/Helpers.cs
+++ b/src/System.Management.Automation/engine/ComInterop/Helpers.cs
@@ -1,8 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+#nullable enable
+
using System;
using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
namespace System.Management.Automation.ComInterop
{
@@ -33,7 +36,7 @@ internal static Expression Convert(Expression expression, Type type)
internal static class Requires
{
[System.Diagnostics.Conditional("DEBUG")]
- internal static void NotNull(object value, string paramName)
+ internal static void NotNull(object value, [CallerArgumentExpression("value")] string? paramName = null)
{
ArgumentNullException.ThrowIfNull(value, paramName);
}
diff --git a/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs
index b340cf54967..9826ac9d467 100644
--- a/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs
+++ b/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs
@@ -23,7 +23,7 @@ internal IDispatchMetaObject(Expression expression, IDispatchComObject self)
public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
ComMethodDesc method = null;
@@ -63,7 +63,7 @@ public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, Dy
public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
if (_self.TryGetGetItem(out ComMethodDesc method))
{
@@ -108,7 +108,7 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
ComBinder.ComGetMemberBinder comBinder = binder as ComBinder.ComGetMemberBinder;
bool canReturnCallables = comBinder?._canReturnCallables ?? false;
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
// 1. Try methods
if (_self.TryGetMemberMethod(binder.Name, out ComMethodDesc method))
@@ -187,7 +187,7 @@ private DynamicMetaObject BindEvent(ComEventDesc eventDesc)
public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
if (_self.TryGetGetItem(out ComMethodDesc getItem))
{
@@ -203,7 +203,7 @@ public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMet
public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
if (_self.TryGetSetItem(out ComMethodDesc setItem))
{
@@ -238,7 +238,7 @@ public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMet
public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
{
- Requires.NotNull(binder, nameof(binder));
+ Requires.NotNull(binder);
return
// 1. Check for simple property put