Skip to content

Commit aa3bd32

Browse files
authored
Merge pull request #2774 from AzureAD/josephpab/merge_release_1.17.0_into_dev
Merge release 2.6.0 into dev
2 parents e0789ef + 4cc2264 commit aa3bd32

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## [TBD]
1+
## [2.6.0]
22
* Support domain_hint param #2759
33

44
## [2.5.1]

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.1"
3+
s.version = "2.6.0"
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.1</string>
18+
<string>2.6.0</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.1</string>
18+
<string>2.6.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

MSAL/src/MSAL_Internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
//------------------------------------------------------------------------------
2727

2828
#define MSAL_VER_HIGH 2
29-
#define MSAL_VER_LOW 5
30-
#define MSAL_VER_PATCH 1
29+
#define MSAL_VER_LOW 6
30+
#define MSAL_VER_PATCH 0
3131

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

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ let package = Package(
1313
targets: ["MSAL"]),
1414
],
1515
targets: [
16-
.binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/2.5.1/MSAL.zip", checksum: "487557cef9c59e9de4ba1f46fd828e58883e59ef0672fea56a7fbd16507faf98")
16+
.binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/2.6.0/MSAL.zip", checksum: "546a5d74bc255ca4881a4f8cc4ea69d63f8c773227224a870675760b6af15674")
1717
]
1818
)

0 commit comments

Comments
 (0)