Merge branch 'dev' into 2781-what-happened-to-the-parameters-descriptions

Author: timayabi2020

.azure-pipelines/config/credscan/credscan-suppressions.json

@@ -38,13 +38,14 @@
       "file": [
         "src\\Users.Actions\\beta\\examples\\Test-MgBetaUserPassword.md",
         "src\\Users.Actions\\beta\\examples\\Update-MgBetaUserPassword.md",
+        "src\\Users.Actions\\beta\\examples\\Reset-MgBetaUserAuthenticationMethodPassword.md",
         "src\\Users.Actions\\v1.0\\examples\\Update-MgUserPassword.md"
       ],
       "_justification": "[Users.Actions] Examples contain random values recognized as secret"
     },
     {
       "file": [
-        "src\\DeviceManagement.Actions\\beta\\examples\\Update-MgBetaDeviceManagementVirtualEndpointOnPremisConnectionAdDomainPassword.md"
+        "src\\DeviceManagement.Actions\\beta\\examples\\Update-MgBetaDeviceManagementVirtualEndpointOnPremiseConnectionAdDomainPassword.md"
       ],
       "_justification": "[DeviceManagement.Actions] Examples contain random values recognized as secret"
     },

src/Applications/beta/examples/Get-MgBetaServicePrincipalSynchronizationTemplate.md

@@ -999,8 +999,11 @@ private string QualifyFilePath(string path)
         /// </summary>
         private void ResetGraphSessionEnvironment()
         {
-            _originalEnvironment = GraphSession.Instance.Environment;
-            GraphSession.Instance.Environment = _originalEnvironment;
+            var currentEnvironment = GraphSession.Instance.Environment;
+            if(currentEnvironment != null && !currentEnvironment.Equals(_originalEnvironment))
+            {
+                GraphSession.Instance.Environment = _originalEnvironment;
+            }
         }
 
         #region CmdLet LifeCycle
@@ -1039,6 +1042,8 @@ private async Task ProcessRecordAsync()
                             if (ShouldCheckHttpStatus && !isSuccess)
                             {
                                 var httpErrorRecord = await GenerateHttpErrorRecordAsync(httpResponseMessageFormatter, httpRequestMessage);
+                                // A reset of the GraphSession Environment is required to avoid side effects
+                                ResetGraphSessionEnvironment();
                                 ThrowTerminatingError(httpErrorRecord);
                             }
                             await ProcessResponseAsync(httpResponseMessage);