Sync up from Mainline branch for CommitId d3fc36f28a5cd837ef7e5caff5f3b25817e5c495

Author: Release-Agent

src/GeneralTools/CDSClient/Client/Auth/AuthProcessor.cs

@@ -269,7 +269,6 @@ internal async static Task<AuthenticationResult> ObtainAccessTokenAsync(
 			{
 				if (clientCredentialsCheck && !useDefaultCreds && !(promptBehavior == PromptBehavior.Always || promptBehavior == PromptBehavior.SelectAccount))
 				{
-					logSink.Log("ObtainAccessToken - CRED", TraceEventType.Verbose);
 					_authenticationResult = publicAppClient.AcquireTokenByUsernamePassword(scopes, clientCredentials.UserName.UserName, CdsServiceClient.MakeSecureString(clientCredentials.UserName.Password)).ExecuteAsync().Result;
 				}
 				else
@@ -278,12 +277,10 @@ internal async static Task<AuthenticationResult> ObtainAccessTokenAsync(
 					{
 						if (!string.IsNullOrEmpty(loginUserHint))
 						{
-							logSink.Log("ObtainAccessToken - DEFAULT CREDS - Passed UPN", TraceEventType.Verbose);
 							_authenticationResult = await publicAppClient.AcquireTokenByIntegratedWindowsAuth(scopes).WithUsername(loginUserHint).ExecuteAsync();
 						}
 						else
 						{
-							logSink.Log("ObtainAccessToken - DEFAULT CREDS", TraceEventType.Verbose);
 							_authenticationResult = await publicAppClient.AcquireTokenByIntegratedWindowsAuth(scopes).ExecuteAsync();
 						}
 					}
@@ -351,7 +348,6 @@ internal async static Task<AuthenticationResult> ObtainAccessTokenAsync(
 			AuthenticationResult _authenticationResult = null;
 			if (confidentialAppClient != null)
 			{
-				logSink.Log("ObtainAccessToken - Confidential Client", TraceEventType.Verbose);
 				_authenticationResult = await confidentialAppClient.AcquireTokenForClient(scopes).ExecuteAsync();
 			}
 			else

src/GeneralTools/CDSClient/Client/CdsConnectionService.cs

@@ -1371,9 +1371,6 @@ internal void SetClonedProperties(CdsServiceClient sourceClient)
 			TenantId = sourceClient.TenantId;
 			EnvironmentId = sourceClient.EnvironmentId;
 			GetAccessTokenAsync = sourceClient.GetAccessToken;
-			//_authority = sourceClient.CdsConnectionSvc.AuthContext == null
-			//				? string.Empty
-			//				: sourceClient.CdsConnectionSvc.AuthContext.Authority;
 		}
 
 		#region WebAPI Interface Utilities

src/GeneralTools/CDSClient/Client/CdsServiceClient.cs

@@ -911,11 +911,12 @@ internal void ConnectToCdsService(string cdsConnectionString)
         /// <param name="externalOrgWebProxyClient">User Provided Organization Web Proxy Client</param>
         /// <param name="isCloned">when true, skips init</param>
         /// <param name="orginalAuthType">Auth type of source connection</param>
-        internal CdsServiceClient(OrganizationWebProxyClient externalOrgWebProxyClient, bool isCloned = true , AuthenticationType orginalAuthType = AuthenticationType.OAuth)
+        /// <param name="sourceOrgVersion">source organization version</param>
+        internal CdsServiceClient(OrganizationWebProxyClient externalOrgWebProxyClient, bool isCloned = true , AuthenticationType orginalAuthType = AuthenticationType.OAuth , Version sourceOrgVersion = null)
         {
             CreateCdsServiceConnection(null, orginalAuthType, string.Empty, string.Empty, string.Empty, null, string.Empty,
                 MakeSecureString(string.Empty), string.Empty, string.Empty, string.Empty, false, false, null, string.Empty, null,
-                PromptBehavior.Auto,  externalOrgWebProxyClient, isCloned: isCloned);
+                PromptBehavior.Auto,  externalOrgWebProxyClient, isCloned: isCloned , incomingOrgVersion: sourceOrgVersion);
         }
 
 
@@ -945,8 +946,9 @@ internal CdsServiceClient(OrganizationWebProxyClient externalOrgWebProxyClient,
         /// <param name="certificateStoreName">StoreName to look in for certificate identified by certificateThumbPrint</param>
         /// <param name="certificateThumbPrint">ThumbPrint of the Certificate to load</param>
         /// <param name="instanceUrl">Actual URI of the Organization Instance</param>
-        /// <param name="isCloned">When True, Indicates that the contruction request is coming from a clone operation. </param>
+        /// <param name="isCloned">When True, Indicates that the construction request is coming from a clone operation. </param>
         /// <param name="useDefaultCreds">(optional) If true attempts login using current user ( Online ) </param>
+        /// <param name="incomingOrgVersion">Incoming Org Version, used as part of clone.</param>
         internal void CreateCdsServiceConnection(
             object externalOrgServiceProxy,
             AuthenticationType requestedAuthType,
@@ -971,7 +973,8 @@ internal void CreateCdsServiceConnection(
             X509Certificate2 certificate = null,
             Uri instanceUrl = null,
             bool isCloned = false,
-            bool useDefaultCreds = false
+            bool useDefaultCreds = false,
+            Version incomingOrgVersion = null
             )
         {
 
@@ -1037,6 +1040,10 @@ internal void CreateCdsServiceConnection(
             {
                 CdsConnectionSvc = new CdsConnectionService(externalOrgWebProxyClient, logEntry);
                 CdsConnectionSvc.IsAClone = isCloned;
+                if ( isCloned && incomingOrgVersion != null)
+                {
+                    CdsConnectionSvc.OrganizationVersion = incomingOrgVersion; 
+                }
             }
             else
             {
@@ -1196,9 +1203,8 @@ public CdsServiceClient Clone(System.Reflection.Assembly strongTypeAsm)
             if (proxy != null)
             {
                 proxy.HeaderToken = CdsConnectionSvc.CdsWebClient.HeaderToken;
-                var SvcClient = new CdsServiceClient(proxy, true , CdsConnectionSvc.AuthenticationTypeInUse);
+                var SvcClient = new CdsServiceClient(proxy, true , CdsConnectionSvc.AuthenticationTypeInUse ,CdsConnectionSvc.OrganizationVersion);
                 SvcClient.CdsConnectionSvc.SetClonedProperties(this);
-                SvcClient._BatchManager = _BatchManager;
                 SvcClient.CallerAADObjectId = CallerAADObjectId;
                 SvcClient.CallerId = CallerId;
                 SvcClient.MaxRetryCount = _maxRetryCount;
@@ -4826,7 +4832,7 @@ internal bool AddRequestToBatch(Guid batchId, OrganizationRequest req, string ba
             {
                 // if request should bypass plugin exec.
                 if (bypassPluginExecution && ConnectedOrgVersion >= Utilities.CDSFeatureVersionMinimums.AllowBypassCustomPlugin)
-                    req.Parameters.Add(Utilities.CDSRequestHeaders.BYPASSCUSTOMPLUGINEXECUTION, "true");
+                    req.Parameters.Add(Utilities.CDSRequestHeaders.BYPASSCUSTOMPLUGINEXECUTION, true);
 
                 if (IsBatchOperationsAvailable)
                 {
@@ -5478,7 +5484,7 @@ internal OrganizationResponse CdsCommand_Execute(OrganizationRequest req, string
 
                     // if request should bypass plugin exec.
                     if (bypassPluginExecution && ConnectedOrgVersion >= Utilities.CDSFeatureVersionMinimums.AllowBypassCustomPlugin)
-                        req.Parameters.Add(Utilities.CDSRequestHeaders.BYPASSCUSTOMPLUGINEXECUTION, "true");
+                        req.Parameters.Add(Utilities.CDSRequestHeaders.BYPASSCUSTOMPLUGINEXECUTION, true);
 
                     logEntry.Log(string.Format(CultureInfo.InvariantCulture, "Execute Command - {0}{1}: RequestID={2} {3}",
                         req.RequestName,
@@ -5691,8 +5697,8 @@ private void LogException(OrganizationRequest req, Exception ex, string errorStr
             else if (ex is HttpOperationException httpOperationException)
             {
                 JObject contentBody = JObject.Parse(httpOperationException.Response.Content);
-                var errorMessage = CdsTraceLogger.GetFirstLineFromString(contentBody["error"]["message"].ToString()).Trim();
-                logEntry.Log(string.Format(CultureInfo.InvariantCulture, "************ {3} - {2} : {0} |=> {1}", errorStringCheck, errorMessage, webUriMessageReq, ex.GetType().Name), TraceEventType.Error, ex);
+                CdsClientOperationException ex01 = CdsClientOperationException.GenerateCdsClientOperationException(httpOperationException);
+                logEntry.Log(string.Format(CultureInfo.InvariantCulture, "************ {3} - {2} : {0} |=> {1}", errorStringCheck, CdsTraceLogger.GetFirstLineFromString(contentBody["error"]["message"].ToString()).Trim(), webUriMessageReq, ex.GetType().Name), TraceEventType.Error, ex01);
             }
             else
             {