Resolving conflicts and merging from main

Author: trwalke

.github/workflows/spellcheck.yml

@@ -1,4 +1,4 @@
-# .github/workflows/spellcheck.yml
+# .github/workflows/spellcheck.yml
 name: Spell check
 on: [pull_request]
 
@@ -7,14 +7,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: codespell-project/actions-codespell@v2
+
+      ############################################################
+      # 1️⃣  Built-in codespell action  → PR annotations
+      ############################################################
+      - name: Codespell (built-in dictionary)
+        uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630
         with:
           check_filenames: true           # also scan file names
           ignore_words_file: .codespellignore
           skip: >
-            src/client/Microsoft.Identity.Client/json/**,
-            tests/**,
-            devapps/**,
-            build/**,
-            docs/**,
-            prototype/**
+            src/client/Microsoft.Identity.Client/json,
+            tests,
+            devapps,
+            build,
+            docs,
+            prototype,
+
+      ############################################################
+      # 2️⃣  Raw CLI pass  → enforces your custom typo pairs
+      ############################################################
+      - name: Install codespell
+        run: pip install --quiet --no-deps "codespell==2.4.1"
+
+      - name: Codespell (custom pair list)
+        run: |
+          codespell --check-filenames \
+            --dictionary build/codespell_pairs.txt \
+            --ignore-words .codespellignore \
+            --skip "src/client/Microsoft.Identity.Client/json,tests,devapps,build,docs,prototype" \
+            .

CHANGELOG.md

@@ -1,12 +1,73 @@
+4.78.0
+======
+### Changes
+* Update SDK version from 8.0.404 to 8.0.415. [#5543](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5543)
+* Hide / deprecate some obscure APIs. [#5484](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5484)
+
+### Bug Fixes
+* Support Android edge-to-edge. [#5499](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5499)
+* Android broker does not support ADFS authority. [#5522](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5522)
+
+4.77.1
+======
+
+* Adjusted issuer validation to accept differing paths https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5466
+* Added better error message for OIDC error https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5433
+* Reverted changes made for Http2 https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5462
+
+4.77.0
+======
+### Features
+* Added WinUI 3 support for Desktop Broker flows. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5411
+* Introduced extensibility API to allow users to add custom HTTP headers to token acquisition requests (under extensibility). https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5440
+
+### Changes
+* Remove passing `x-client-os` as a query parameter in the authorization URI. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5456
+* Bump `Microsoft.IdentityModel.Abstractions` to a supported version. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5452
+
+### Bug fixes
+* Remove confusing error text as it only applies to one of many possible causes. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5467
+
+4.76.0
+======
+
+### New Features
+* Removal of `ExperimentalFeatures` flag on `WithMtlsProofOfPossession` API
+* Add Service Fabric token revocation support
+* Adding WithExtraBodyParameters api
+* Enable mTLS Proof‑of‑Possession for Client‑Assertion Delegates
+
+### Bug Fixes
+* #5400 Fixing issue that leads to multiple active access tokens in the cache for non-tenanted oidc authority 
+* Update NativeInterop package version to 0.19.4 
+
+4.74.1
+======
+
+### Bug fixes
+* When you configure MSAL with WithOidcAuthority(), the library now confirms that the issuer returned by the OIDC discovery endpoint matches the expected authority (including CIAM patterns) and throws an exception if it does not. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5358 
+
+* Re-expose public AuthenticationResult constructor. A public, test-friendly constructor of AuthenticationResult was inadvertently hidden behind [Obsolete] and [EditorBrowsable(Never)]. The constructor is now publicly available again. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5392
+
+4.74.0
+======
+
+### Features
+* Deprecate ROPC flow in Public Client Applications https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5355.
+* AuthenticationResult exposes a new BindingCertificate property that returns the X.509 certificate bound to the access token in mTLS-PoP scenarios. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5370.
+
+### Bug fixes
+* MSAL now honors the DEFAULT_IDENTITY_CLIENT_ID environment variable when acquiring tokens from Azure Machine Learning managed-identity endpoint. https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5350.
+
 4.73.1
 ======
 
 ### Features
-Deprecate AcquireTokenByIntegratedWindowsAuth API in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5345
+* Deprecate AcquireTokenByIntegratedWindowsAuth API in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5345
 
 ### Bug fixes
-Update native interop to 0.19.2 by @fengga in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5362 to solve broker bugs
-update the deprecated openURL(:) api to openURL(:options:completionHandler) in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5354
+* Update native interop to 0.19.2 by @fengga in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5362 to solve broker bugs
+* update the deprecated openURL(:) api to openURL(:options:completionHandler) in https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5354
 
 4.73.0
 =======
@@ -26,6 +87,7 @@ update the deprecated openURL(:) api to openURL(:options:completionHandler) in h
 
 ### Bug Fixes
 - Ensure instance of IMsalHttpClientFactory passed by the user is used for managed identity flows that do not require cert validation. See [Issue #5286](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5286)
+- Fix a URL typo in the API comments. See [issue 5277](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5277)
 
 4.72.0
 =======

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!-- Version of the Microsoft.Identity.Client.NativeInterop package. -->
-    <MSALRuntimeNativeInteropVersion>0.19.2</MSALRuntimeNativeInteropVersion>
+    <MSALRuntimeNativeInteropVersion>0.19.4</MSALRuntimeNativeInteropVersion>
     <!-- Version of MSAL if not defined by the CI-->
     <MsalInternalVersion>4.61.0</MsalInternalVersion>
   </PropertyGroup>
@@ -12,16 +12,20 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.RulesetToEditorconfigConverter" Version="3.3.3" PrivateAssets="All" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageVersion Include="Microsoft.Identity.Client.NativeInterop" Version="$(MSALRuntimeNativeInteropVersion)" IncludeAssets="all" />
-    <PackageVersion Include="Microsoft.IdentityModel.Abstractions" Version="6.35.0" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.864.35" />
+    <PackageVersion Include="Microsoft.IdentityModel.Abstractions" Version="8.14.0" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
     <PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
     <!-- Should match Azure Functions runtime: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/4456 -->
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
+    <PackageVersion Include="System.Formats.Asn1" Version="9.0.8" />
     <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Json" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
+    <PackageVersion Include="System.Security.Cryptography.Cng" Version="5.0.0" PrivateAssets="All" />
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
     <PackageVersion Include="System.Security.SecureString" Version="4.3.0" />
     <PackageVersion Include="System.ServiceModel.Http" Version="4.5.3" />
@@ -71,7 +75,6 @@
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
-    <PackageVersion Include="System.Security.Cryptography.Cng" Version="5.0.0" />
     <PackageVersion Include="System.Text.Json" Version="6.0.10" />
     <PackageVersion Include="System.Threading" Version="4.3.0" />
     <PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
@@ -80,6 +83,5 @@
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="System.Windows.Forms" Version="4.0.0" />
     <PackageVersion Include="CommandLineParser" Version="2.8.0" />
-    <PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
   </ItemGroup>
 </Project>