Skip to content

Commit

Permalink
Merge main in dev (#2171)
Browse files Browse the repository at this point in the history
* Update core.

* Bump version.

* modified:   CHANGELOG.md

* modified:   IdentityCore

* Merge release 1.3.3 to main (#2165)

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Update msal-release-ado-trigger.yml for Azure Pipelines

* Delete spm-framework.yml

* Update from dev

* remove test

* Reintroduce Minimum OS Version Requirements to Readme

Reintroducing minimum version indicators that were [mistakenly?] removed in #2080

* So support ssh-cert flow through broker (Update submodule only) (#2134)

* cc update

* Update submodule

* Update submodule

* ID Token should be updated when Access Token is refreshed/acquired silently (#2141)

* Changed refresh token to update account and tokens on UserAccountResult

* Unit tests

* Swiftlint

* Updated code comment

* PR Comments

* Update automation.yml for Azure Pipelines

* Update automation.yml for Azure Pipelines

* Update automation.yml for Azure Pipelines

* This PR removes the ADAL keyvault and client secret (#2150)

* Update submodule

* Update yml file

* Revert conf file from testings

* Update msal submodule (#2160)

* Update core.

* Bump version.

* modified:   CHANGELOG.md

* modified:   IdentityCore

---------

Co-authored-by: Ameya Patil <[email protected]>
Co-authored-by: Ameya <>
Co-authored-by: Antonio Alwan <[email protected]>
Co-authored-by: Hieu Nguyen <[email protected]>
Co-authored-by: Ameya Patil <[email protected]>
Co-authored-by: Hieu Nguyen <[email protected]>
Co-authored-by: Brian Melton-Grace <[email protected]>
Co-authored-by: Kai <[email protected]>
Co-authored-by: Silviu Petrescu <[email protected]>
Co-authored-by: Swasti Gupta <[email protected]>

* modified:   MSAL/IdentityCore

* Updating MSAL framework checksum & url for 1.3.3 [skip ci]

---------

Co-authored-by: Ameya Patil <[email protected]>
Co-authored-by: Antonio Alwan <[email protected]>
Co-authored-by: Hieu Nguyen <[email protected]>
Co-authored-by: Ameya Patil <[email protected]>
Co-authored-by: Hieu Nguyen <[email protected]>
Co-authored-by: Brian Melton-Grace <[email protected]>
Co-authored-by: Kai <[email protected]>
Co-authored-by: Silviu Petrescu <[email protected]>
Co-authored-by: Swasti Gupta <[email protected]>
  • Loading branch information
10 people authored May 21, 2024
1 parent 5a1e6bb commit 2e3d434
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [1.3.3]
* Update common core submodule.
* Automation improvements.

## [1.3.2]
* Add forceRefresh param to ignore AT in cache and request a new AT.

Expand Down
2 changes: 1 addition & 1 deletion MSAL.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MSAL"
s.version = "1.3.2"
s.version = "1.3.3"
s.summary = "Microsoft Authentication Library (MSAL) for iOS"
s.description = <<-DESC
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.
Expand Down
2 changes: 1 addition & 1 deletion MSAL/resources/ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion MSAL/resources/mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
2 changes: 1 addition & 1 deletion MSAL/src/MSAL_Internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#define MSAL_VER_HIGH 1
#define MSAL_VER_LOW 3
#define MSAL_VER_PATCH 2
#define MSAL_VER_PATCH 3

#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ let package = Package(
targets: ["MSAL"]),
],
targets: [
.binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.3.2/MSAL.zip", checksum: "06ce6a727e6707673815452956861d2846bcff0e40afdcca3cebdb22e371028e")
.binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.3.3/MSAL.zip", checksum: "4c4a52ed5bbc20875efed36707216ce0ca6b2b8846f2b88c16fc44f634093f2d")
]
)

0 comments on commit 2e3d434

Please sign in to comment.