Merge pull request #2568 from AzureAD/mipetriu/idcore_main_and_merge_conflicts

mipetriu · web-flow · commit c56d1f1c73b7 · 2025-04-03T13:44:01.000-07:00
Resolve merge conflict with main + update common core to main
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 30b3220bc1a6169967614cfda13c0ae4bf41382c
+Subproject commit 52c192604ab7bdae0367c6fa072bc4e872a970d6
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.8.0/MSAL.zip", checksum: "f72cec6d325d14e0ad8edca2c740548c97a345822e7ed6750ccb3a41a3a5366c")
+      .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.8.1/MSAL.zip", checksum: "b783b229da1cdd0c01ba3e46e089e1d8af8bcb4b2306e15e8f713970f54f84ff")
   ]
 )

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.8.0/MSAL.zip", checksum: "f72cec6d325d14e0ad8edca2c740548c97a345822e7ed6750ccb3a41a3a5366c")`
	`16`	`+ .binaryTarget(name: "MSAL", url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc/releases/download/1.8.1/MSAL.zip", checksum: "b783b229da1cdd0c01ba3e46e089e1d8af8bcb4b2306e15e8f713970f54f84ff")`
`17`	`17`	`]`
`18`	`18`	`)`