From dbda20c26b888240a7319b539425e1011b293c34 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 14 Feb 2022 12:56:42 -0800 Subject: [PATCH] Kaisong1990/resolve merge release conflicts (#1442) * Updating MSAL framework checksum & url for 1.1.25 [skip ci] * Merge release 1.1.26 in master (#1429) * Allow to pass eqp to the /token endpoint. * Update changelog. * .. * updated changelog * Update common core * Updating common-core for fix in embedded wv * Updating changelog * Add PR number in changelog * Update changelog. Co-authored-by: petlee Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng Co-authored-by: Ameya Patil * Updating MSAL framework checksum & url for 1.1.26 [skip ci] * point to release 1.7.5 * add a space to trigger pipeline Co-authored-by: Yong Zeng Co-authored-by: Sergei Demchenko Co-authored-by: petlee Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil --- MSAL/IdentityCore | 2 +- MSAL/src/MSALPublicClientApplication.m | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore index b5a1c01e0..fa69ed888 160000 --- a/MSAL/IdentityCore +++ b/MSAL/IdentityCore @@ -1 +1 @@ -Subproject commit b5a1c01e05676033e75827356708b719d982e634 +Subproject commit fa69ed8883b18f5ebd990166a7053e610118285c diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m index 475c9d903..4ec005d27 100644 --- a/MSAL/src/MSALPublicClientApplication.m +++ b/MSAL/src/MSALPublicClientApplication.m @@ -1449,6 +1449,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account return; } + #if !TARGET_OS_IPHONE // Clear additional cache locations NSDictionary *additionalPartnerLocations = MSALWipeCacheForAllAccountsConfig.additionalPartnerLocations;