Skip to content

Commit f9565e0

Browse files
Update Microsoft.Identity.Client(.*) (#513)
1 parent c1c72e6 commit f9565e0

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

Directory.Packages.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
1111
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
1212
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
13-
<PackageVersion Include="Microsoft.Identity.Client" Version="4.54.1" />
14-
<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.54.1" />
15-
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.31.0" />
13+
<PackageVersion Include="Microsoft.Identity.Client" Version="4.64.0" />
14+
<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
15+
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.0" />
1616
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1717
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
1818
<PackageVersion Include="Moq" Version="4.18.4" />

src/Authentication/AzureArtifacts.cs

+6-15
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,22 @@ public static PublicClientApplicationBuilder CreateDefaultBuilder(Uri authority)
3636
public static PublicClientApplicationBuilder WithBroker(this PublicClientApplicationBuilder builder, bool enableBroker, ILogger logger)
3737
{
3838
// Eventually will be rolled into CreateDefaultBuilder as using the brokers is desirable
39-
if (!enableBroker)
39+
if (!enableBroker || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
4040
{
4141
return builder;
4242
}
4343

44-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
45-
{
46-
logger.LogTrace(Resources.MsalUsingWamBroker);
44+
logger.LogTrace(Resources.MsalUsingWamBroker);
4745

48-
builder
49-
.WithBroker(new BrokerOptions(BrokerOptions.OperatingSystems.Windows)
46+
return builder
47+
.WithBroker(
48+
new BrokerOptions(BrokerOptions.OperatingSystems.Windows)
5049
{
5150
Title = "Azure DevOps Artifacts",
5251
ListOperatingSystemAccounts = true,
5352
MsaPassthrough = true
5453
})
55-
.WithParentActivityOrWindow(() => GetConsoleOrTerminalWindow());
56-
}
57-
else
58-
{
59-
logger.LogTrace(Resources.MsalUsingBroker);
60-
builder.WithBroker();
61-
}
62-
63-
return builder;
54+
.WithParentActivityOrWindow(() => GetConsoleOrTerminalWindow());
6455
}
6556

6657
public static PublicClientApplicationBuilder WithHttpClient(this PublicClientApplicationBuilder builder, HttpClient? httpClient = null)

src/Authentication/Microsoft.Artifacts.Authentication.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<LangVersion>latest</LangVersion>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
10-
<VersionPrefix>0.2.2</VersionPrefix>
10+
<VersionPrefix>0.2.3</VersionPrefix>
1111
<Authors>Microsoft</Authors>
1212
<Owners>Microsoft</Owners>
1313
<Description>Azure Artifacts authentication library for credential providers.</Description>

0 commit comments

Comments
 (0)