From a5b0f0972fe0858302422a464ce5fbb9ca6ecc88 Mon Sep 17 00:00:00 2001
From: jennyf19 <jeferrie@microsoft.com>
Date: Thu, 13 Jul 2023 11:21:34 -0700
Subject: [PATCH] Update abstractions to 4.0 (#2329)

* Update abstractions to 4.0

* Fixing a regression caused by a change
in Abstractions 4.0.0 (expected)

---------

Co-authored-by: Jean-Marc Prieur <jmprieur@microsoft.com>
---
 Directory.Build.props                                        | 2 +-
 src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9fd64c7b6..dd2df12ff 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -73,7 +73,7 @@
     <MicrosoftGraphVersion>4.34.0</MicrosoftGraphVersion>
     <MicrosoftGraphBetaVersion>4.50.0-preview</MicrosoftGraphBetaVersion>
     <MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
-    <MicrosoftIdentityAbstractions>3.2.0</MicrosoftIdentityAbstractions>
+    <MicrosoftIdentityAbstractions>4.0.0</MicrosoftIdentityAbstractions>
     <!--CVE-2021-24112-->
     <SystemDrawingCommon>4.7.2</SystemDrawingCommon>
   </PropertyGroup>
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs b/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
index 62a5ba03a..8e86bdf98 100644
--- a/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
+++ b/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
@@ -454,7 +454,7 @@ public void PrepareAuthorityInstanceForMsal()
         public static void UpdateMergedOptionsFromMicrosoftIdentityApplicationOptions(MicrosoftIdentityApplicationOptions microsoftIdentityApplicationOptions, MergedOptions mergedOptions)
         {
             mergedOptions.AllowWebApiToBeAuthorizedByACL |= microsoftIdentityApplicationOptions.AllowWebApiToBeAuthorizedByACL;
-            if (string.IsNullOrEmpty(mergedOptions.Authority) && microsoftIdentityApplicationOptions.Authority != "/v2.0" && !string.IsNullOrEmpty(microsoftIdentityApplicationOptions.Authority))
+            if (string.IsNullOrEmpty(mergedOptions.Authority) && microsoftIdentityApplicationOptions.Authority != "//v2.0" && !string.IsNullOrEmpty(microsoftIdentityApplicationOptions.Authority))
             {
                 mergedOptions.Authority = microsoftIdentityApplicationOptions.Authority;
             }