Skip to content

Commit c41838c

Browse files
Avery-DunnAvery-Dunn
committed
Update Azure.Identity and Extensions.Http
1 parent ab920c1 commit c41838c

13 files changed

Lines changed: 42 additions & 44 deletions

‎Directory.Build.props‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,20 @@
8585
<FxCopAnalyzersVersion>3.3.0</FxCopAnalyzersVersion>
8686
<SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
8787
<AzureSecurityKeyVaultSecretsVersion>4.6.0</AzureSecurityKeyVaultSecretsVersion>
88-
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
88+
<AzureIdentityVersion>1.17.2</AzureIdentityVersion>
8989
<AzureSecurityKeyVaultCertificatesVersion>4.6.0</AzureSecurityKeyVaultCertificatesVersion>
9090
<MicrosoftGraphVersion>4.36.0</MicrosoftGraphVersion>
9191
<MicrosoftGraphBetaVersion>4.57.0-preview</MicrosoftGraphBetaVersion>
9292
<!--CVE-2024-43485-->
93-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
93+
<SystemTextJsonVersion>8.0.6</SystemTextJsonVersion>
9494
<!--CVE-2023-29331-->
9595
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
9696
<BannedApiAnalyzersVersion>4.14.0</BannedApiAnalyzersVersion>
9797
<PublicApiAnalyzersVersion>4.14.0</PublicApiAnalyzersVersion>
98+
<!-- Logging.Abstractions needs a separate version variable because Azure.Core 1.50.0
99+
(via System.ClientModel 1.8.0) requires Logging.Abstractions >= 8.0.3, but the full
100+
Microsoft.Extensions.Logging package has no 8.0.3 release (jumps from 8.0.1 to 9.0.0). -->
101+
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
98102
</PropertyGroup>
99103

100104
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -110,6 +114,7 @@
110114
<SystemSecurityCryptographyPkcsVersion>$(SystemSecurityCryptographyServicingVersion)</SystemSecurityCryptographyPkcsVersion>
111115
<SystemSecurityCryptographyXmlVersion>$(SystemSecurityCryptographyServicingVersion)</SystemSecurityCryptographyXmlVersion>
112116
<MicrosoftExtensionsLoggingVersion>$(NetNineRuntimeVersion)</MicrosoftExtensionsLoggingVersion>
117+
<MicrosoftExtensionsLoggingAbstractionsVersion>$(NetNineRuntimeVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
113118
<MicrosoftExtensionsConfigurationBinderVersion>$(NetNineRuntimeVersion)</MicrosoftExtensionsConfigurationBinderVersion>
114119
<SystemFormatsAsn1Version>$(NetNineRuntimeVersion)</SystemFormatsAsn1Version>
115120
<SystemTextJsonVersion>$(NetNineRuntimeVersion)</SystemTextJsonVersion>
@@ -129,6 +134,7 @@
129134
<SystemSecurityCryptographyPkcsVersion>$(SystemSecurityCryptographyServicingVersion)</SystemSecurityCryptographyPkcsVersion>
130135
<SystemSecurityCryptographyXmlVersion>$(SystemSecurityCryptographyServicingVersion)</SystemSecurityCryptographyXmlVersion>
131136
<MicrosoftExtensionsLoggingVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsLoggingVersion>
137+
<MicrosoftExtensionsLoggingAbstractionsVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
132138
<MicrosoftExtensionsConfigurationBinderVersion>$(NetTenRuntimeVersion)</MicrosoftExtensionsConfigurationBinderVersion>
133139
<SystemFormatsAsn1Version>$(NetTenRuntimeVersion)</SystemFormatsAsn1Version>
134140
<SystemTextJsonVersion>$(NetTenRuntimeVersion)</SystemTextJsonVersion>
@@ -144,6 +150,7 @@
144150
<SystemSecurityCryptographyPkcsVersion>8.0.1</SystemSecurityCryptographyPkcsVersion>
145151
<SystemSecurityCryptographyXmlVersion>8.0.3</SystemSecurityCryptographyXmlVersion>
146152
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
153+
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
147154
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
148155
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0</MicrosoftExtensionsConfigurationBinderVersion>
149156
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
@@ -155,7 +162,7 @@
155162
<MicrosoftExtensionsCachingMemoryVersion>6.0.2</MicrosoftExtensionsCachingMemoryVersion>
156163
<!-- Microsoft.Extensions.* 5.* are obsoleted -->
157164
<MicrosoftExtensionsHostingVersion>6.0.0</MicrosoftExtensionsHostingVersion>
158-
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
165+
<MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
159166
<MicrosoftAspNetCoreDataProtectionVersion>6.0.0</MicrosoftAspNetCoreDataProtectionVersion>
160167
<SystemSecurityCryptographyPkcsVersion>7.0.2</SystemSecurityCryptographyPkcsVersion>
161168
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
@@ -167,22 +174,21 @@
167174
<MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
168175

169176
<!-- Microsoft.Extensions.Configuration.Binder 6.* are obsoleted -->
170-
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0</MicrosoftExtensionsConfigurationBinderVersion>
171-
<MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
177+
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0</MicrosoftExtensionsConfigurationBinderVersion>
178+
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
172179
</PropertyGroup>
173180

174181
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net472'">
175182
<MicrosoftAspNetCoreDataProtectionVersion>2.1.0</MicrosoftAspNetCoreDataProtectionVersion>
176183
<!-- CVE-2022-34716 due to DataProtection 2.1.0 -->
177184
<SystemSecurityCryptographyPkcsVersion>7.0.2</SystemSecurityCryptographyPkcsVersion>
178185
<SystemSecurityCryptographyXmlVersion>4.7.1</SystemSecurityCryptographyXmlVersion>
179-
<MicrosoftExtensionsLoggingVersion>4.7.1</MicrosoftExtensionsLoggingVersion>
180186
<MicrosoftExtensionsCachingMemoryVersion>2.1.0</MicrosoftExtensionsCachingMemoryVersion>
181187
<MicrosoftExtensionsHostingVersion>2.1.1</MicrosoftExtensionsHostingVersion>
182-
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
188+
<MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
183189
<MicrosoftExtensionsLoggingVersion>2.1.0</MicrosoftExtensionsLoggingVersion>
184-
<MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
185-
<MicrosoftExtensionsConfigurationBinderVersion>2.1.0</MicrosoftExtensionsConfigurationBinderVersion>
190+
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
191+
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0</MicrosoftExtensionsConfigurationBinderVersion>
186192
</PropertyGroup>
187193

188194
<ItemGroup>

‎src/Microsoft.Identity.Web.Certificate/KeyVaultCertificateLoader.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public async Task LoadIfNeededAsync(CredentialDescription credentialDescription,
6666
ExcludeAzureDeveloperCliCredential = true,
6767
ExcludeAzurePowerShellCredential = true,
6868
ExcludeInteractiveBrowserCredential = true,
69-
ExcludeSharedTokenCacheCredential = true,
7069
ExcludeVisualStudioCodeCredential = true,
7170
ExcludeVisualStudioCredential = true
7271
};

‎src/Microsoft.Identity.Web.Certificate/Microsoft.Identity.Web.Certificate.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="$(AzureSecurityKeyVaultSecretsVersion)" />
1919
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
2020
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="$(AzureSecurityKeyVaultCertificatesVersion)" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingVersion)" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
2222
<PackageReference Include="Microsoft.Identity.Abstractions" Version="$(MicrosoftIdentityAbstractionsVersion)" />
2323
</ItemGroup>
2424

‎src/Microsoft.Identity.Web.Certificateless/ManagedIdentityClientAssertion.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ private void Log(
138138
string message,
139139
bool containsPii)
140140
{
141+
if (_logger == null)
142+
{
143+
return;
144+
}
145+
141146
switch (level)
142147
{
143148
case Client.LogLevel.Always:

‎src/Microsoft.Identity.Web.Certificateless/Microsoft.Identity.Web.Certificateless.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingVersion)" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
2323
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens " Version="$(MicrosoftIdentityModelVersion)" />
2424
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
2525
</ItemGroup>

‎src/Microsoft.Identity.Web.DownstreamApi/DownstreamApi.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ public Task<HttpResponseMessage> CallApiForAppAsync(
604604
// Otherwise use the default HttpClientFactory with optional named client.
605605
HttpClient client = requestResult?.BindingCertificate != null && _msalHttpClientFactory is IMsalMtlsHttpClientFactory msalMtlsHttpClientFactory
606606
? msalMtlsHttpClientFactory.GetHttpClient(requestResult.BindingCertificate)
607-
: (string.IsNullOrEmpty(serviceName) ? _httpClientFactory.CreateClient() : _httpClientFactory.CreateClient(serviceName));
607+
: (string.IsNullOrEmpty(serviceName) ? _httpClientFactory.CreateClient() : _httpClientFactory.CreateClient(serviceName!));
608608

609609
// Send the HTTP message
610610
downstreamApiResult = await client.SendAsync(httpRequestMessage, cancellationToken).ConfigureAwait(false);

‎src/Microsoft.Identity.Web.OWIN/AppBuilderExtension.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public static IAppBuilder AddMicrosoftIdentityWebApi(
6262
configuration?.GetSection(configurationSection).Bind(option);
6363
}));
6464

65-
string instance = configuration.GetValue<string>($"{configurationSection}:Instance");
66-
string tenantId = configuration.GetValue<string>($"{configurationSection}:TenantId");
67-
string clientId = configuration.GetValue<string>($"{configurationSection}:ClientId");
68-
string audience = configuration.GetValue<string>($"{configurationSection}:Audience");
65+
string? instance = configuration.GetValue<string>($"{configurationSection}:Instance");
66+
string? tenantId = configuration.GetValue<string>($"{configurationSection}:TenantId");
67+
string? clientId = configuration.GetValue<string>($"{configurationSection}:ClientId");
68+
string? audience = configuration.GetValue<string>($"{configurationSection}:Audience");
6969
string authority = instance + tenantId + "/v2.0";
7070
TokenValidationParameters tokenValidationParameters = new()
7171
{
@@ -121,10 +121,10 @@ public static IAppBuilder AddMicrosoftIdentityWebApp(
121121
configuration?.GetSection(configurationSection).Bind(option);
122122
}));
123123

124-
string instance = configuration.GetValue<string>($"{configurationSection}:Instance");
125-
string tenantId = configuration.GetValue<string>($"{configurationSection}:TenantId");
126-
string clientId = configuration.GetValue<string>($"{configurationSection}:ClientId");
127-
string postLogoutRedirectUri = configuration.GetValue<string>($"{configurationSection}:SignedOutCallbackPath");
124+
string? instance = configuration.GetValue<string>($"{configurationSection}:Instance");
125+
string? tenantId = configuration.GetValue<string>($"{configurationSection}:TenantId");
126+
string? clientId = configuration.GetValue<string>($"{configurationSection}:ClientId");
127+
string? postLogoutRedirectUri = configuration.GetValue<string>($"{configurationSection}:SignedOutCallbackPath");
128128
string authority = instance + tenantId + "/v2.0";
129129

130130
OpenIdConnectAuthenticationOptions options = new()

‎src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</None>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.24" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.24" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2828
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
2929
<PackageReference Include="Microsoft.Graph" Version="$(MicrosoftGraphVersion)" />
3030
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelVersion)" />

‎src/Microsoft.Identity.Web.OWIN/OwinTokenAcquirerFactory.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public class OwinTokenAcquirerFactory : TokenAcquirerFactory
2525
/// <returns></returns>
2626
protected override string DefineConfiguration(IConfigurationBuilder builder)
2727
{
28-
_ = builder.AddInMemoryCollection(new Dictionary<string, string>()
28+
_ = builder.AddInMemoryCollection(new Dictionary<string, string?>()
2929
{
30-
["AzureAd:Instance"] = EnsureTrailingSlash(ConfigurationManager.AppSettings["ida:Instance"] ?? ConfigurationManager.AppSettings["ida:AADInstance"] ?? "https://login.microsoftonline.com/"),
31-
["AzureAd:ClientId"] = ConfigurationManager.AppSettings["ida:ClientId"],
32-
["AzureAd:TenantId"] = ConfigurationManager.AppSettings["ida:Tenant"] ?? ConfigurationManager.AppSettings["ida:TenantId"],
33-
["AzureAd:Audience"] = ConfigurationManager.AppSettings["ida:Audience"],
34-
["AzureAd:ClientSecret"] = ConfigurationManager.AppSettings["ida:ClientSecret"],
35-
["AzureAd:SignedOutCallbackPath"] = ConfigurationManager.AppSettings["ida:PostLogoutRedirectUri"],
36-
["AzureAd:RedirectUri"] = ConfigurationManager.AppSettings["ida:RedirectUri"],
30+
["AzureAd:Instance"] = EnsureTrailingSlash(System.Configuration.ConfigurationManager.AppSettings["ida:Instance"] ?? System.Configuration.ConfigurationManager.AppSettings["ida:AADInstance"] ?? "https://login.microsoftonline.com/"),
31+
["AzureAd:ClientId"] = System.Configuration.ConfigurationManager.AppSettings["ida:ClientId"],
32+
["AzureAd:TenantId"] = System.Configuration.ConfigurationManager.AppSettings["ida:Tenant"] ?? System.Configuration.ConfigurationManager.AppSettings["ida:TenantId"],
33+
["AzureAd:Audience"] = System.Configuration.ConfigurationManager.AppSettings["ida:Audience"],
34+
["AzureAd:ClientSecret"] = System.Configuration.ConfigurationManager.AppSettings["ida:ClientSecret"],
35+
["AzureAd:SignedOutCallbackPath"] = System.Configuration.ConfigurationManager.AppSettings["ida:PostLogoutRedirectUri"],
36+
["AzureAd:RedirectUri"] = System.Configuration.ConfigurationManager.AppSettings["ida:RedirectUri"],
3737
});
3838

3939
return HostingEnvironment.MapPath("~/");

‎src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
2626
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
2727
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

0 commit comments

Comments
 (0)