Use null propagation operator for windows build (PowerShell#17795)

fflaten · web-flow · commit 5f4e10045694 · 2022-07-29T10:34:09.000-07:00
* Use null propagation in CimCmdlets

* Use null propagation in Diagnostics and Management

* ignore IDE0031 rule in ConsoleHost

* Use null propagation in WSMan.Management

* Use null propagation in SMA

* ignore IDE0031 for securityDescHandle

* cleanup after review
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
@@ -528,10 +528,7 @@ private void Cleanup()
             }
 
             this.moreActionEvent.Dispose();
-            if (this.ackedEvent != null)
-            {
-                this.ackedEvent.Dispose();
-            }
+            this.ackedEvent?.Dispose();
 
             DebugHelper.WriteLog("Cleanup complete.", 2);
         }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
@@ -168,10 +168,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     // Dispose managed resources.
-                    if (this.completeEvent != null)
-                    {
-                        this.completeEvent.Dispose();
-                    }
+                    this.completeEvent?.Dispose();
                 }
 
                 // Call the appropriate methods to clean up
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
@@ -470,10 +470,7 @@ internal void SetParameter(object value, string parameterName)
                 return;
             }
 
-            if (this.parameterBinder != null)
-            {
-                this.parameterBinder.SetParameter(parameterName, this.AtBeginProcess);
-            }
+            this.parameterBinder?.SetParameter(parameterName, this.AtBeginProcess);
         }
         #endregion
 
@@ -576,10 +573,7 @@ protected void Dispose(bool disposing)
         protected virtual void DisposeInternal()
         {
             // Dispose managed resources.
-            if (this.operation != null)
-            {
-                this.operation.Dispose();
-            }
+            this.operation?.Dispose();
         }
         #endregion
 
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
@@ -232,8 +232,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetAssociatedInstance operation = this.GetOperationAgent();
-            if (operation != null)
-                operation.ProcessRemainActions(this.CmdletOperation);
+            operation?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
@@ -202,10 +202,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetCimClass cimGetCimClass = this.GetOperationAgent();
-            if (cimGetCimClass != null)
-            {
-                cimGetCimClass.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimGetCimClass?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
@@ -491,10 +491,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetInstance cimGetInstance = this.GetOperationAgent();
-            if (cimGetInstance != null)
-            {
-                cimGetInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimGetInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
@@ -408,10 +408,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimInvokeCimMethod cimInvokeMethod = this.GetOperationAgent();
-            if (cimInvokeMethod != null)
-            {
-                cimInvokeMethod.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimInvokeMethod?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
@@ -377,10 +377,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimNewCimInstance cimNewCimInstance = this.GetOperationAgent();
-            if (cimNewCimInstance != null)
-            {
-                cimNewCimInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimNewCimInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
@@ -334,10 +334,7 @@ protected override void DisposeInternal()
             base.DisposeInternal();
 
             // Dispose managed resources.
-            if (this.cimNewSession != null)
-            {
-                this.cimNewSession.Dispose();
-            }
+            this.cimNewSession?.Dispose();
         }
         #endregion
     }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
@@ -227,10 +227,7 @@ protected override object GetSourceObject()
                     break;
             }
 
-            if (watcher != null)
-            {
-                watcher.SetCmdlet(this);
-            }
+            watcher?.SetCmdlet(this);
 
             return watcher;
         }
@@ -275,10 +272,7 @@ private static void newSubscriber_Unsubscribed(
             DebugHelper.WriteLogEx();
 
             CimIndicationWatcher watcher = sender as CimIndicationWatcher;
-            if (watcher != null)
-            {
-                watcher.Stop();
-            }
+            watcher?.Stop();
         }
 
         #region private members
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
@@ -276,10 +276,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimRemoveCimInstance cimRemoveInstance = this.GetOperationAgent();
-            if (cimRemoveInstance != null)
-            {
-                cimRemoveInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimRemoveInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
@@ -325,10 +325,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimSetCimInstance cimSetCimInstance = this.GetOperationAgent();
-            if (cimSetCimInstance != null)
-            {
-                cimSetCimInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimSetCimInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
@@ -317,8 +317,7 @@ protected override void ProcessRecord()
         /// </summary>
         protected override void EndProcessing()
         {
-            if (_providerMetadata != null)
-                _providerMetadata.Dispose();
+            _providerMetadata?.Dispose();
 
             base.EndProcessing();
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -393,17 +393,10 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_timer != null)
-                {
-                    _timer.Dispose();
-                }
-
+                _timer?.Dispose();
                 _waitHandler.Dispose();
                 _cancel.Dispose();
-                if (_powershell != null)
-                {
-                    _powershell.Dispose();
-                }
+                _powershell?.Dispose();
             }
         }
 
@@ -1098,10 +1091,7 @@ protected override void StopProcessing()
             _cancel.Cancel();
             _waitHandler.Set();
 
-            if (_timer != null)
-            {
-                _timer.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-            }
+            _timer?.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
 
             if (_powershell != null)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
@@ -169,10 +169,7 @@ protected override void ProcessRecord()
         /// </summary>
         protected override void StopProcessing()
         {
-            if (_searchProcess != null)
-            {
-                _searchProcess.Dispose();
-            }
+            _searchProcess?.Dispose();
         }
         #endregion Overrides
 
@@ -227,10 +224,7 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_searchProcess != null)
-                {
-                    _searchProcess.Dispose();
-                }
+                _searchProcess?.Dispose();
             }
         }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -277,6 +277,7 @@ internal static int Start(
             }
             finally
             {
+#pragma warning disable IDE0031
                 if (s_theConsoleHost != null)
                 {
 #if LEGACYTELEMETRY
@@ -292,6 +293,7 @@ internal static int Start(
 #endif
                     s_theConsoleHost.Dispose();
                 }
+#pragma warning restore IDE0031
             }
 
             unchecked
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -370,17 +370,8 @@ internal string ReadFile(string path)
             }
             finally
             {
-                if (_sr != null)
-                {
-                    // _sr.Close();
-                    _sr.Dispose();
-                }
-
-                if (_fs != null)
-                {
-                    // _fs.Close();
-                    _fs.Dispose();
-                }
+                _sr?.Dispose();
+                _fs?.Dispose();
             }
 
             return strOut;
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1171,23 +1171,20 @@ private void CleanUp()
 
             try
             {
-                if (_nativeProcess != null)
-                {
-                    // on Unix, we need to kill the process to ensure it terminates as Dispose() merely
-                    // closes the redirected streams and the processs does not exit on macOS.  However,
-                    // on Windows, a winexe like notepad should continue running so we don't want to kill it.
+                // on Unix, we need to kill the process to ensure it terminates as Dispose() merely
+                // closes the redirected streams and the processs does not exit on macOS.  However,
+                // on Windows, a winexe like notepad should continue running so we don't want to kill it.
 #if UNIX
-                    try
-                    {
-                        _nativeProcess.Kill();
-                    }
-                    catch
-                    {
-                        // Ignore all exception since it is cleanup.
-                    }
-#endif
-                    _nativeProcess.Dispose();
+                try
+                {
+                    _nativeProcess?.Kill();
                 }
+                catch
+                {
+                    // Ignore all exception since it is cleanup.
+                }
+#endif
+                _nativeProcess?.Dispose();
             }
             catch (Exception)
             {
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
@@ -574,10 +574,7 @@ internal static bool IsWinPEHost()
             catch (ObjectDisposedException) { }
             finally
             {
-                if (winPEKey != null)
-                {
-                    winPEKey.Dispose();
-                }
+                winPEKey?.Dispose();
             }
 #endif
             return false;
diff --git a/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs
@@ -569,10 +569,7 @@ internal override void StartOperation()
 
             internal override void StopOperation()
             {
-                if (_queryRunspaces != null)
-                {
-                    _queryRunspaces.StopAllOperations();
-                }
+                _queryRunspaces?.StopAllOperations();
 
                 _session.Runspace.StateChanged -= StateCallBackHandler;
                 SendStopComplete();
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
@@ -404,15 +404,8 @@ protected override void StopProcessing()
                 tmpJob = _job;
             }
 
-            if (tmpPipeline != null)
-            {
-                tmpPipeline.StopAsync();
-            }
-
-            if (tmpJob != null)
-            {
-                tmpJob.StopJob();
-            }
+            tmpPipeline?.StopAsync();
+            tmpJob?.StopJob();
         }
 
         #endregion
@@ -818,19 +811,13 @@ private void DisconnectAndStopRunningCmds(RemoteRunspace remoteRunspace)
 
                 remoteRunspace.Disconnect();
 
-                if (stopPipelineReceive != null)
+                try
                 {
-                    try
-                    {
-                        stopPipelineReceive.Set();
-                    }
-                    catch (ObjectDisposedException) { }
+                    stopPipelineReceive?.Set();
                 }
+                catch (ObjectDisposedException) { }
 
-                if (job != null)
-                {
-                    job.StopJob();
-                }
+                job?.StopJob();
             }
         }
 
@@ -876,10 +863,7 @@ private void ConnectSessionToHost(PSSession session, PSRemotingJob job = null)
 
                         foreach (var result in childJob.ReadAll())
                         {
-                            if (result != null)
-                            {
-                                result.WriteStreamObject(this);
-                            }
+                            result?.WriteStreamObject(this);
                         }
 
                         if (index == 0)
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -504,10 +504,7 @@ private static NamedPipeServerStream CreateNamedPipe(
                 securityAttributes);
 
             int lastError = Marshal.GetLastWin32Error();
-            if (securityDescHandle != null)
-            {
-                securityDescHandle.Value.Free();
-            }
+            securityDescHandle?.Free();
 
             if (pipeHandle.IsInvalid)
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivity.cs b/src/System.Management.Automation/utils/tracing/EtwActivity.cs

Original file line number	Diff line number	Diff line change
`@@ -528,10 +528,7 @@ private void Cleanup()`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`this.moreActionEvent.Dispose();`
`531`		`- if (this.ackedEvent != null)`
`532`		`- {`
`533`		`- this.ackedEvent.Dispose();`
`534`		`- }`
	`531`	`+ this.ackedEvent?.Dispose();`
`535`	`532`
`536`	`533`	`DebugHelper.WriteLog("Cleanup complete.", 2);`
`537`	`534`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,10 +168,7 @@ protected virtual void Dispose(bool disposing)`
`168`	`168`	`if (disposing)`
`169`	`169`	`{`
`170`	`170`	`// Dispose managed resources.`
`171`		`- if (this.completeEvent != null)`
`172`		`- {`
`173`		`- this.completeEvent.Dispose();`
`174`		`- }`
	`171`	`+ this.completeEvent?.Dispose();`
`175`	`172`	`}`
`176`	`173`
`177`	`174`	`// Call the appropriate methods to clean up`
Original file line number	Diff line number	Diff line change
`@@ -470,10 +470,7 @@ internal void SetParameter(object value, string parameterName)`
`470`	`470`	`return;`
`471`	`471`	`}`
`472`	`472`
`473`		`- if (this.parameterBinder != null)`
`474`		`- {`
`475`		`- this.parameterBinder.SetParameter(parameterName, this.AtBeginProcess);`
`476`		`- }`
	`473`	`+ this.parameterBinder?.SetParameter(parameterName, this.AtBeginProcess);`
`477`	`474`	`}`
`478`	`475`	`#endregion`
`479`	`476`
`@@ -576,10 +573,7 @@ protected void Dispose(bool disposing)`
`576`	`573`	`protected virtual void DisposeInternal()`
`577`	`574`	`{`
`578`	`575`	`// Dispose managed resources.`
`579`		`- if (this.operation != null)`
`580`		`- {`
`581`		`- this.operation.Dispose();`
`582`		`- }`
	`576`	`+ this.operation?.Dispose();`
`583`	`577`	`}`
`584`	`578`	`#endregion`
`585`	`579`
Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,7 @@ protected override void ProcessRecord()`
`232`	`232`	`protected override void EndProcessing()`
`233`	`233`	`{`
`234`	`234`	`CimGetAssociatedInstance operation = this.GetOperationAgent();`
`235`		`- if (operation != null)`
`236`		`- operation.ProcessRemainActions(this.CmdletOperation);`
	`235`	`+ operation?.ProcessRemainActions(this.CmdletOperation);`
`237`	`236`	`}`
`238`	`237`
`239`	`238`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -202,10 +202,7 @@ protected override void ProcessRecord()`
`202`	`202`	`protected override void EndProcessing()`
`203`	`203`	`{`
`204`	`204`	`CimGetCimClass cimGetCimClass = this.GetOperationAgent();`
`205`		`- if (cimGetCimClass != null)`
`206`		`- {`
`207`		`- cimGetCimClass.ProcessRemainActions(this.CmdletOperation);`
`208`		`- }`
	`205`	`+ cimGetCimClass?.ProcessRemainActions(this.CmdletOperation);`
`209`	`206`	`}`
`210`	`207`
`211`	`208`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -491,10 +491,7 @@ protected override void ProcessRecord()`
`491`	`491`	`protected override void EndProcessing()`
`492`	`492`	`{`
`493`	`493`	`CimGetInstance cimGetInstance = this.GetOperationAgent();`
`494`		`- if (cimGetInstance != null)`
`495`		`- {`
`496`		`- cimGetInstance.ProcessRemainActions(this.CmdletOperation);`
`497`		`- }`
	`494`	`+ cimGetInstance?.ProcessRemainActions(this.CmdletOperation);`
`498`	`495`	`}`
`499`	`496`
`500`	`497`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -408,10 +408,7 @@ protected override void ProcessRecord()`
`408`	`408`	`protected override void EndProcessing()`
`409`	`409`	`{`
`410`	`410`	`CimInvokeCimMethod cimInvokeMethod = this.GetOperationAgent();`
`411`		`- if (cimInvokeMethod != null)`
`412`		`- {`
`413`		`- cimInvokeMethod.ProcessRemainActions(this.CmdletOperation);`
`414`		`- }`
	`411`	`+ cimInvokeMethod?.ProcessRemainActions(this.CmdletOperation);`
`415`	`412`	`}`
`416`	`413`
`417`	`414`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -377,10 +377,7 @@ protected override void ProcessRecord()`
`377`	`377`	`protected override void EndProcessing()`
`378`	`378`	`{`
`379`	`379`	`CimNewCimInstance cimNewCimInstance = this.GetOperationAgent();`
`380`		`- if (cimNewCimInstance != null)`
`381`		`- {`
`382`		`- cimNewCimInstance.ProcessRemainActions(this.CmdletOperation);`
`383`		`- }`
	`380`	`+ cimNewCimInstance?.ProcessRemainActions(this.CmdletOperation);`
`384`	`381`	`}`
`385`	`382`
`386`	`383`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -334,10 +334,7 @@ protected override void DisposeInternal()`
`334`	`334`	`base.DisposeInternal();`
`335`	`335`
`336`	`336`	`// Dispose managed resources.`
`337`		`- if (this.cimNewSession != null)`
`338`		`- {`
`339`		`- this.cimNewSession.Dispose();`
`340`		`- }`
	`337`	`+ this.cimNewSession?.Dispose();`
`341`	`338`	`}`
`342`	`339`	`#endregion`
`343`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,7 @@ protected override object GetSourceObject()`
`227`	`227`	`break;`
`228`	`228`	`}`
`229`	`229`
`230`		`- if (watcher != null)`
`231`		`- {`
`232`		`- watcher.SetCmdlet(this);`
`233`		`- }`
	`230`	`+ watcher?.SetCmdlet(this);`
`234`	`231`
`235`	`232`	`return watcher;`
`236`	`233`	`}`
`@@ -275,10 +272,7 @@ private static void newSubscriber_Unsubscribed(`
`275`	`272`	`DebugHelper.WriteLogEx();`
`276`	`273`
`277`	`274`	`CimIndicationWatcher watcher = sender as CimIndicationWatcher;`
`278`		`- if (watcher != null)`
`279`		`- {`
`280`		`- watcher.Stop();`
`281`		`- }`
	`275`	`+ watcher?.Stop();`
`282`	`276`	`}`
`283`	`277`
`284`	`278`	`#region private members`