Update Microsoft.Identity.Client(.*) (#513)

microsoft · Sep 5, 2024 · f9565e0 · f9565e0
1 parent c1c72e6
commit f9565e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,9 +10,9 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.54.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.54.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.31.0" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.64.0" />
+    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
+    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />

diff --git a/src/Authentication/AzureArtifacts.cs b/src/Authentication/AzureArtifacts.cs
@@ -36,31 +36,22 @@ public static PublicClientApplicationBuilder CreateDefaultBuilder(Uri authority)
     public static PublicClientApplicationBuilder WithBroker(this PublicClientApplicationBuilder builder, bool enableBroker, ILogger logger)
     {
         // Eventually will be rolled into CreateDefaultBuilder as using the brokers is desirable
-        if (!enableBroker)
+        if (!enableBroker || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
             return builder;
         }
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            logger.LogTrace(Resources.MsalUsingWamBroker);
+        logger.LogTrace(Resources.MsalUsingWamBroker);
 
-            builder
-                .WithBroker(new BrokerOptions(BrokerOptions.OperatingSystems.Windows)
+        return builder
+            .WithBroker(
+                new BrokerOptions(BrokerOptions.OperatingSystems.Windows)
                 {
                     Title = "Azure DevOps Artifacts",
                     ListOperatingSystemAccounts = true,
                     MsaPassthrough = true
                 })
-                .WithParentActivityOrWindow(() => GetConsoleOrTerminalWindow());
-        }
-        else
-        {
-            logger.LogTrace(Resources.MsalUsingBroker);
-            builder.WithBroker();
-        }
-
-        return builder;
+            .WithParentActivityOrWindow(() => GetConsoleOrTerminalWindow());
     }
 
     public static PublicClientApplicationBuilder WithHttpClient(this PublicClientApplicationBuilder builder, HttpClient? httpClient = null)

diff --git a/src/Authentication/Microsoft.Artifacts.Authentication.csproj b/src/Authentication/Microsoft.Artifacts.Authentication.csproj
@@ -7,7 +7,7 @@
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <VersionPrefix>0.2.2</VersionPrefix>
+    <VersionPrefix>0.2.3</VersionPrefix>
     <Authors>Microsoft</Authors>
     <Owners>Microsoft</Owners>
     <Description>Azure Artifacts authentication library for credential providers.</Description>