Skip to content

Commit 9fb4a80

Browse files
committed
Merge branch 'hotfix/2.4.3' into hotfix/2.5.2
# Conflicts: # CHANGELOG.md # MSAL.podspec # MSAL/IdentityCore # MSAL/resources/ios/Info.plist # MSAL/resources/mac/Info.plist # MSAL/src/MSAL_Internal.h
2 parents 2d4471b + db635d2 commit 9fb4a80

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
## [2.5.2]
2+
* Update changes from version 2.4.3
3+
14
## [2.5.1]
25
* Allow duna external idp on MacOs
36

47
## [2.5.0]
58
* Awaiting MFA Delegate now automatically returns the AuthMethods to be used when calling MFA Challenge #2687
69
* SDK now handles SMS as strong authentication method #2722
710

11+
## [2.4.3]
12+
* Fix issue with legacy keychain on macOS.
13+
814
## [2.4.2]
915
* Bug fix to prevent crash when deallocating STK SecKeyRef
1016

MSAL.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MSAL"
3-
s.version = "2.5.0"
3+
s.version = "2.5.2"
44
s.summary = "Microsoft Authentication Library (MSAL) for iOS"
55
s.description = <<-DESC
66
The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

MSAL/resources/ios/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.0</string>
18+
<string>2.5.2</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

MSAL/resources/mac/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.0</string>
18+
<string>2.5.2</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

MSAL/src/MSAL_Internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#define MSAL_VER_HIGH 2
2929
#define MSAL_VER_LOW 5
30-
#define MSAL_VER_PATCH 0
30+
#define MSAL_VER_PATCH 2
3131

3232
#define STR_HELPER(x) #x
3333
#define STR(x) STR_HELPER(x)

0 commit comments

Comments
 (0)