-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Kaisong1990/resolve merge release conflicts #1442
Merged
kaisong1990
merged 6 commits into
release/1.2.0
from
kaisong1990/resolve-merge-release-conflicts
Feb 14, 2022
Merged
Kaisong1990/resolve merge release conflicts #1442
kaisong1990
merged 6 commits into
release/1.2.0
from
kaisong1990/resolve-merge-release-conflicts
Feb 14, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com>
oldalton
approved these changes
Feb 14, 2022
@@ -1 +1 @@ | |||
Subproject commit b5a1c01e05676033e75827356708b719d982e634 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pull request does not update CHANGELOG.md.
Please consider if this change would be noticeable to a partner or user and either update CHANGELOG.md or resolve this conversation.
kaisong1990
added a commit
that referenced
this pull request
Mar 2, 2022
* 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 * Add additional flag to know when to wipe cache for all accounts. * Add button to wipe all accounts in MSAL Test App * Update submodule * Update submodule * Update submodule * Merge master in dev (#1432) * 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Multiple WPJ PkeyAuth support * Add a list of additional locations for partner caches to be wiped. Add unit test. * Update changelog * Update comments for wipeCacheForAllAccounts property. * Add SBOM task (#1425) * Add SBOM task. * Update sbom task. * Changes to expose Mdm Id via Device Info sso ext request * Addressed review comments * Multitenant PkeyAuth support * Merge dev in common core * Updated changelog * Fixed changelog * Fixed library version in Info.plist files * Revert breaking API change to unbreak MSAL CPP * Update code to remove token cache from additional locations, allow to continue in case one fails but keep track of the list of failed locations. * Fix build error, code will only run on MacOS * Updated to return mdmId only if not nil or not empty * Add more logs in getDeviceInfo flow due to an IcM (#1439) * Add more logs in getDeviceInfo flow due to an IcM * Address Cr * Read the keychain data in order to trigger the prompt asking for login password, user HAS TO click 'Always Allow' to then be able to delete it. * Update submodule * Return failing additional partner locations as userInfo in case of error. Add test that check wiping for additional partner locations. * Continue trying to remove remaining partner locations cache if there is a read error. * Update MSAL.podspec The project does not seem to be a preliminary preview any longer. * Update common core to v2 pkeyauth changes * Addressed additional comments * Addressed comments * Added more test cases * common core updated * updated msal to point to latest common core after common core merge * update versions * 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * 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 <zeyong@microsoft.com> Co-authored-by: Sergei Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Kaisong1990/update automation device version (#1445) * Update the simulator target * fix for Umbrella header for module 'MSAL' does not include header 'MSALWipeCacheForAllAccountsConfig.h' in automation * Add fix to disable to disable 3 tests due to Labe pending certificate, also apply fix on one test * Update CommonCore submodule to align with its latest master hash (#1450) Co-authored-by: Sergey Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> Co-authored-by: Juan Arias Roldan <jariasroldan@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@olgas-work-mac.lan> Co-authored-by: Veena Soman <veenasoman@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@Olgas-Work-Mac.local> Co-authored-by: Wolfgang Lutz <WLBORg@gmx.de> Co-authored-by: Olga Dalton <oldalton@microsoft.com> Co-authored-by: Juan Arias <juan-arias@users.noreply.github.com>
kaisong1990
added a commit
that referenced
this pull request
Mar 3, 2022
* 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] * Release/1.2.0 (#1444) * 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 * Add additional flag to know when to wipe cache for all accounts. * Add button to wipe all accounts in MSAL Test App * Update submodule * Update submodule * Update submodule * Merge master in dev (#1432) * 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Updating MSAL framework checksum & url for 1.1.26 [skip ci] Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Multiple WPJ PkeyAuth support * Add a list of additional locations for partner caches to be wiped. Add unit test. * Update changelog * Update comments for wipeCacheForAllAccounts property. * Add SBOM task (#1425) * Add SBOM task. * Update sbom task. * Changes to expose Mdm Id via Device Info sso ext request * Addressed review comments * Multitenant PkeyAuth support * Merge dev in common core * Updated changelog * Fixed changelog * Fixed library version in Info.plist files * Revert breaking API change to unbreak MSAL CPP * Update code to remove token cache from additional locations, allow to continue in case one fails but keep track of the list of failed locations. * Fix build error, code will only run on MacOS * Updated to return mdmId only if not nil or not empty * Add more logs in getDeviceInfo flow due to an IcM (#1439) * Add more logs in getDeviceInfo flow due to an IcM * Address Cr * Read the keychain data in order to trigger the prompt asking for login password, user HAS TO click 'Always Allow' to then be able to delete it. * Update submodule * Return failing additional partner locations as userInfo in case of error. Add test that check wiping for additional partner locations. * Continue trying to remove remaining partner locations cache if there is a read error. * Update MSAL.podspec The project does not seem to be a preliminary preview any longer. * Update common core to v2 pkeyauth changes * Addressed additional comments * Addressed comments * Added more test cases * common core updated * updated msal to point to latest common core after common core merge * update versions * 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 <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * 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 <zeyong@microsoft.com> Co-authored-by: Sergei Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> * Kaisong1990/update automation device version (#1445) * Update the simulator target * fix for Umbrella header for module 'MSAL' does not include header 'MSALWipeCacheForAllAccountsConfig.h' in automation * Add fix to disable to disable 3 tests due to Labe pending certificate, also apply fix on one test * Update CommonCore submodule to align with its latest master hash (#1450) Co-authored-by: Sergey Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Jason Zeng <zeyong@microsoft.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> Co-authored-by: Juan Arias Roldan <jariasroldan@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@olgas-work-mac.lan> Co-authored-by: Veena Soman <veenasoman@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@Olgas-Work-Mac.local> Co-authored-by: Wolfgang Lutz <WLBORg@gmx.de> Co-authored-by: Olga Dalton <oldalton@microsoft.com> Co-authored-by: Juan Arias <juan-arias@users.noreply.github.com> * Use dotnet 2.1.0 in release pipeline for ESRP * Adding workaround of installing corenet app 2.1.x for ESRP task * Updating MSAL framework checksum & url for 1.2.0 [skip ci] * resolve merge conflicts Co-authored-by: Yong Zeng <zeyong@microsoft.com> Co-authored-by: Sergei Demchenko <sedemche@microsoft.com> Co-authored-by: petlee <petlee@microsoft.com> Co-authored-by: Peter Lee <30302999+NerevarineRule@users.noreply.github.com> Co-authored-by: Ameya Patil <amepatil@microsoft.com> Co-authored-by: Juan Arias Roldan <jariasroldan@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@olgas-work-mac.lan> Co-authored-by: Veena Soman <veenasoman@microsoft.com> Co-authored-by: Olga Dalton <olgadalton@Olgas-Work-Mac.local> Co-authored-by: Wolfgang Lutz <WLBORg@gmx.de> Co-authored-by: Olga Dalton <oldalton@microsoft.com> Co-authored-by: Juan Arias <juan-arias@users.noreply.github.com> Co-authored-by: Ameya Patil <ameyapat@buffalo.edu>
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Describe what this PR is trying to do.
Type of change
Risk
Additional information