Merge pull request #2330 from AzureAD/spetrescu/merge_main_1.5.0_to_dev

jasoncoolmax · web-flow · commit 13e7df253ac9 · 2024-09-11T10:10:05.000-07:00
Merge main 1.5.0 back to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 ## [TBD]:
-* Increased macOS minimum version to 10.15 #2220
-* Added Native Auth feature for MacOS to interact with the Microsoft Entra ID services
 * VisionOS support added (#2139)
 
+## [1.5.0]
+* Increased macOS minimum version to 10.15 (#2220)
+* Added Native Auth feature for MacOS to interact with the Microsoft Entra ID services (#2220)
+
 ## [1.4.2]
 * Fix invalid cert auth request handling (hotfix). (#2278)
 
diff --git a/MSAL.podspec b/MSAL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.4.2"
+  s.version      = "1.5.0"
   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.
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 3ef956fd6bfc08772fa23c2606d6d72cadfce691
+Subproject commit ec40a8851cf9d2d4bbb06a18c593f953064d723c
diff --git a/MSAL/resources/ios/Info.plist b/MSAL/resources/ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.2</string>
+	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/MSAL/resources/mac/Info.plist b/MSAL/resources/mac/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.2</string>
+	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MSAL/src/MSAL_Internal.h b/MSAL/src/MSAL_Internal.h
@@ -26,8 +26,8 @@
 //------------------------------------------------------------------------------
 
 #define MSAL_VER_HIGH       1
-#define MSAL_VER_LOW        4
-#define MSAL_VER_PATCH      2
+#define MSAL_VER_LOW        5
+#define MSAL_VER_PATCH      0
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/Package.swift b/Package.swift
@@ -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.4.2/MSAL.zip", checksum: "0b6ba11d28e8b1679e9f17ed8219e12c419df73114d66aa7715cc45009171090")
+      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.5.0/MSAL.zip", checksum: "c2379d94286b9f3d410171aaee4a4201e7208a404f1bf2ce275b4ca0963a00dd")
   ]
 )

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ let package = Package(`
`13`	`13`	`targets: ["MSAL"]),`
`14`	`14`	`],`
`15`	`15`	`targets: [`
`16`		`- .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.4.2/MSAL.zip", checksum: "0b6ba11d28e8b1679e9f17ed8219e12c419df73114d66aa7715cc45009171090")`
	`16`	`+ .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.5.0/MSAL.zip", checksum: "c2379d94286b9f3d410171aaee4a4201e7208a404f1bf2ce275b4ca0963a00dd")`
`17`	`17`	`]`
`18`	`18`	`)`