Use compound assignment in Microsoft.PowerShell.ConsoleHost/Security (#17723)

Molkree · web-flow · commit 7af4679191cc · 2022-07-25T22:08:57.000+05:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -1732,10 +1732,7 @@ internal static void ReadConsoleOutput
                 if (origin.X + (contentsRegion.Right - contentsRegion.Left) + 1 < bufferInfo.BufferSize.X &&
                     ShouldCheck(contentsRegion.Right, contents, contentsRegion))
                 {
-                    if (cellArray == null)
-                    {
-                        cellArray = new BufferCell[cellArrayRegion.Bottom + 1, 2];
-                    }
+                    cellArray ??= new BufferCell[cellArrayRegion.Bottom + 1, 2];
 
                     checkOrigin = new Coordinates(origin.X +
                         (contentsRegion.Right - contentsRegion.Left), origin.Y);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -1388,14 +1388,11 @@ internal WrappedSerializer OutputSerializer
         {
             get
             {
-                if (_outputSerializer == null)
-                {
-                    _outputSerializer =
-                        new WrappedSerializer(
-                            OutputFormat,
-                            "Output",
-                            Console.IsOutputRedirected ? Console.Out : ConsoleTextWriter);
-                }
+                _outputSerializer ??=
+                    new WrappedSerializer(
+                        OutputFormat,
+                        "Output",
+                        Console.IsOutputRedirected ? Console.Out : ConsoleTextWriter);
 
                 return _outputSerializer;
             }
@@ -1405,14 +1402,11 @@ internal WrappedSerializer ErrorSerializer
         {
             get
             {
-                if (_errorSerializer == null)
-                {
-                    _errorSerializer =
-                        new WrappedSerializer(
-                            ErrorFormat,
-                            "Error",
-                            Console.IsErrorRedirected ? Console.Error : ConsoleTextWriter);
-                }
+                _errorSerializer ??=
+                    new WrappedSerializer(
+                        ErrorFormat,
+                        "Error",
+                        Console.IsErrorRedirected ? Console.Error : ConsoleTextWriter);
 
                 return _errorSerializer;
             }
@@ -2533,10 +2527,7 @@ internal void Run(bool inputLoopIsNested)
                                     prompt = EvaluateDebugPrompt();
                                 }
 
-                                if (prompt == null)
-                                {
-                                    prompt = EvaluatePrompt();
-                                }
+                                prompt ??= EvaluatePrompt();
                             }
 
                             ui.Write(prompt);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -116,10 +116,7 @@ private void AsyncPipelineFailureHandler(Exception ex)
                 er = new ErrorRecord(er, ex);
             }
 
-            if (er == null)
-            {
-                er = new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);
-            }
+            er ??= new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);
 
             _parent.ErrorSerializer.Serialize(er);
         }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -119,10 +119,7 @@ class PendingProgress
                     ProgressNode parentNode = FindNodeById(newNode.SourceId, newNode.ParentActivityId);
                     if (parentNode != null)
                     {
-                        if (parentNode.Children == null)
-                        {
-                            parentNode.Children = new ArrayList();
-                        }
+                        parentNode.Children ??= new ArrayList();
 
                         AddNode(parentNode.Children, newNode);
                         break;
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -2546,10 +2546,7 @@ private X509NativeStore GetStore(string storePath,
                 }
             }
 
-            if (s_storeCache == null)
-            {
-                s_storeCache = new X509NativeStore(storeLocation, storeName);
-            }
+            s_storeCache ??= new X509NativeStore(storeLocation, storeName);
 
             return s_storeCache;
         }
diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -374,10 +374,7 @@ public string TimestampServer
 
             set
             {
-                if (value == null)
-                {
-                    value = string.Empty;
-                }
+                value ??= string.Empty;
 
                 _timestampServer = value;
             }

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,7 @@ private void AsyncPipelineFailureHandler(Exception ex)`
`116`	`116`	`er = new ErrorRecord(er, ex);`
`117`	`117`	`}`
`118`	`118`
`119`		`- if (er == null)`
`120`		`- {`
`121`		`- er = new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);`
`122`		`- }`
	`119`	`+ er ??= new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);`
`123`	`120`
`124`	`121`	`_parent.ErrorSerializer.Serialize(er);`
`125`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2546,10 +2546,7 @@ private X509NativeStore GetStore(string storePath,`
`2546`	`2546`	`}`
`2547`	`2547`	`}`
`2548`	`2548`
`2549`		`- if (s_storeCache == null)`
`2550`		`- {`
`2551`		`- s_storeCache = new X509NativeStore(storeLocation, storeName);`
`2552`		`- }`
	`2549`	`+ s_storeCache ??= new X509NativeStore(storeLocation, storeName);`
`2553`	`2550`
`2554`	`2551`	`return s_storeCache;`
`2555`	`2552`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,10 +374,7 @@ public string TimestampServer`
`374`	`374`
`375`	`375`	`set`
`376`	`376`	`{`
`377`		`- if (value == null)`
`378`		`- {`
`379`		`- value = string.Empty;`
`380`		`- }`
	`377`	`+ value ??= string.Empty;`
`381`	`378`
`382`	`379`	`_timestampServer = value;`
`383`	`380`	`}`