From 5082a1fa0c3bb144eb6bef5ef6bc796d6202a39e Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Thu, 13 Mar 2025 15:07:54 -0700 Subject: [PATCH 1/6] Make Microsoft.Extensions.Http dependency framework friendly --- Directory.Build.props | 9 ++++++++- .../AspNetCore/JwtBearerOptionsMerger.cs | 2 +- .../ConfidentialClientApplicationOptionsMerger.cs | 2 +- .../MicrosoftAuthenticationOptionsMerger.cs | 2 +- .../OptionsMergers/MicrosoftIdentityOptionsMerger.cs | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 14db851ce..650594130 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -95,7 +95,6 @@ 4.6.0 4.36.0 4.57.0-preview - 3.1.3 8.2.0 8.0.5 @@ -112,6 +111,7 @@ $(AspNetCoreNineRuntimeVersion) $(NetNineRuntimeVersion) $(NetNineRuntimeVersion) + 9.0.0 $(AspNetCoreNineRuntimeVersion) $(NetNineRuntimeVersion) $(NetNineRuntimeVersion) @@ -127,6 +127,7 @@ 8.0.0 8.0.1 8.0.0 + 8.0.0 8.0.1 8.0.0 8.0.1 @@ -141,6 +142,7 @@ 7.0.1 7.0.0 7.0.0 + 7.0.0 7.0.0 7.0.3 @@ -155,6 +157,8 @@ 6.0.12 6.0.2 6.0.0 + + 7.0.0 6.0.0 6.0.1 @@ -173,6 +177,8 @@ 6.0.2 6.0.0 + 7.0.0 + 3.1.3 6.0.0 7.0.2 6.0.1 @@ -196,6 +202,7 @@ 4.7.1 2.1.0 2.1.1 + 3.1.3 2.1.0 2.1.0 2.2.4 diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs index d92481cc5..b47701737 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs @@ -18,7 +18,7 @@ public JwtBearerOptionsMerger(IMergedOptionsStore mergedOptions) private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs index 017748a51..f365e2c2b 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs @@ -16,7 +16,7 @@ public ConfidentialClientApplicationOptionsMerger(IMergedOptionsStore mergedOpti private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs index 89a88f228..bbea66eaa 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs @@ -16,7 +16,7 @@ public MicrosoftIdentityApplicationOptionsMerger(IMergedOptionsStore mergedOptio private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs index 99bfe3c4c..ecf0f87ae 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs @@ -15,7 +15,7 @@ public MicrosoftIdentityOptionsMerger(IMergedOptionsStore mergedOptions) private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, From ec75df02d799f5ff026f09d298abebeb52cc9a54 Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Thu, 13 Mar 2025 15:59:02 -0700 Subject: [PATCH 2/6] Add more missing files --- .../PublicAPI/net6.0/InternalAPI.Shipped.txt | 8 ++++---- src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs | 2 +- .../Policy/RequireScopeOrAppPermissionOptions.cs | 2 +- .../PublicAPI/net6.0/InternalAPI.Shipped.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt index 705b63712..a4236b121 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt +++ b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt @@ -136,7 +136,7 @@ Microsoft.Identity.Web.ConfidentialClientApplicationBuilderExtension Microsoft.Identity.Web.ConfidentialClientApplicationBuilderExtension.Logger Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.ConfidentialClientApplicationOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Client.ConfidentialClientApplicationOptions! options) -> void +Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Client.ConfidentialClientApplicationOptions! options) -> void Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider.CreateAuthorizationHeaderAsync(System.Collections.Generic.IEnumerable! scopes, Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions? downstreamApiOptions = null, System.Security.Claims.ClaimsPrincipal? claimsPrincipal = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider.CreateAuthorizationHeaderForAppAsync(string! scopes, Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions? downstreamApiOptions = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! @@ -177,7 +177,7 @@ Microsoft.Identity.Web.ITokenAcquisitionInternal.AddAccountToCacheFromAuthorizat Microsoft.Identity.Web.ITokenAcquisitionInternal.RemoveAccountAsync(System.Security.Claims.ClaimsPrincipal! user, string? authenticationScheme = null) -> System.Threading.Tasks.Task! Microsoft.Identity.Web.JwtBearerOptionsMerger Microsoft.Identity.Web.JwtBearerOptionsMerger.JwtBearerOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.JwtBearerOptionsMerger.PostConfigure(string! name, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions! options) -> void +Microsoft.Identity.Web.JwtBearerOptionsMerger.PostConfigure(string? name, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions! options) -> void Microsoft.Identity.Web.LoggingEventId Microsoft.Identity.Web.LoggingOptions Microsoft.Identity.Web.LoggingOptions.EnablePiiLogging.get -> bool @@ -226,12 +226,12 @@ Microsoft.Identity.Web.MergedOptionsStore.MergedOptionsStore() -> void Microsoft.Identity.Web.MicrosoftIdentityAppCallsWebApiAuthenticationBuilder.MicrosoftIdentityAppCallsWebApiAuthenticationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfigurationSection? configurationSection = null) -> void Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.MicrosoftIdentityApplicationOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Abstractions.MicrosoftIdentityApplicationOptions! options) -> void +Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Abstractions.MicrosoftIdentityApplicationOptions! options) -> void Microsoft.Identity.Web.MicrosoftIdentityOptions.HasClientCredentials.get -> bool Microsoft.Identity.Web.MicrosoftIdentityOptions.IsB2C.get -> bool Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.MicrosoftIdentityOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Web.MicrosoftIdentityOptions! options) -> void +Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Web.MicrosoftIdentityOptions! options) -> void Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient! Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory.MsalAspNetCoreHttpClientFactory(System.Net.Http.IHttpClientFactory! httpClientFactory) -> void diff --git a/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs b/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs index bcc597067..b64548287 100644 --- a/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs +++ b/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs @@ -26,7 +26,7 @@ public RequireScopeOptions() /// public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs b/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs index 8bf557b6e..e1bc75aa1 100644 --- a/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs +++ b/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs @@ -26,7 +26,7 @@ public RequireScopeOrAppPermissionOptions() /// public void PostConfigure( -#if NET7_0_OR_GREATER +#if NET6_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt b/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt index 367e03282..4d4a6507f 100644 --- a/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt +++ b/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt @@ -48,10 +48,10 @@ Microsoft.Identity.Web.MicrosoftIdentityWebApiAuthenticationBuilderWithConfigura Microsoft.Identity.Web.MicrosoftIdentityWebAppAuthenticationBuilder.MicrosoftIdentityWebAppAuthenticationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! openIdConnectScheme, System.Action! configureMicrosoftIdentityOptions, Microsoft.Extensions.Configuration.IConfigurationSection? configurationSection) -> void Microsoft.Identity.Web.MicrosoftIdentityWebAppAuthenticationBuilderWithConfiguration.MicrosoftIdentityWebAppAuthenticationBuilderWithConfiguration(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! openIdConnectScheme, System.Action! configureMicrosoftIdentityOptions, Microsoft.Extensions.Configuration.IConfigurationSection! configurationSection) -> void Microsoft.Identity.Web.RequireScopeOptions -Microsoft.Identity.Web.RequireScopeOptions.PostConfigure(string! name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void +Microsoft.Identity.Web.RequireScopeOptions.PostConfigure(string? name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void Microsoft.Identity.Web.RequireScopeOptions.RequireScopeOptions() -> void Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions -Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.PostConfigure(string! name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void +Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.PostConfigure(string? name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.RequireScopeOrAppPermissionOptions() -> void Microsoft.Identity.Web.Resource.RegisterValidAudience Microsoft.Identity.Web.Resource.RegisterValidAudience.RegisterAudienceValidation(Microsoft.IdentityModel.Tokens.TokenValidationParameters! validationParameters, Microsoft.Identity.Web.MicrosoftIdentityOptions! microsoftIdentityOptions) -> void From e70219af7a69ccb835014c7fb484309d3802dc78 Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Thu, 13 Mar 2025 16:07:39 -0700 Subject: [PATCH 3/6] Update version --- Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 650594130..83481b67c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -157,7 +157,7 @@ 6.0.12 6.0.2 6.0.0 - + 7.0.0 6.0.0 6.0.1 @@ -177,8 +177,8 @@ 6.0.2 6.0.0 + 7.0.0 - 3.1.3 6.0.0 7.0.2 6.0.1 From f747c7f9df36845b83ada20bbbe8ea0c3c6f36cf Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Fri, 14 Mar 2025 15:18:22 -0700 Subject: [PATCH 4/6] Use Microsoft.Extensions.Http package from .net Framework and use inBox for .net Core --- Directory.Build.props | 8 +------- .../Microsoft.Identity.Web.OWIN.csproj | 5 ++++- .../Microsoft.Identity.Web.TokenAcquisition.csproj | 5 ++++- src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj | 7 +++++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 83481b67c..3d6eb76e0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -111,7 +111,6 @@ $(AspNetCoreNineRuntimeVersion) $(NetNineRuntimeVersion) $(NetNineRuntimeVersion) - 9.0.0 $(AspNetCoreNineRuntimeVersion) $(NetNineRuntimeVersion) $(NetNineRuntimeVersion) @@ -127,7 +126,6 @@ 8.0.0 8.0.1 8.0.0 - 8.0.0 8.0.1 8.0.0 8.0.1 @@ -142,7 +140,6 @@ 7.0.1 7.0.0 7.0.0 - 7.0.0 7.0.0 7.0.3 @@ -157,8 +154,6 @@ 6.0.12 6.0.2 6.0.0 - - 7.0.0 6.0.0 6.0.1 @@ -177,8 +172,7 @@ 6.0.2 6.0.0 - - 7.0.0 + 3.1.3 6.0.0 7.0.2 6.0.1 diff --git a/src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj b/src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj index 25dfd23c7..612cff1d7 100644 --- a/src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj +++ b/src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj @@ -29,7 +29,6 @@ - @@ -40,6 +39,10 @@ + + + + diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj b/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj index 1a5956163..51b1aa9e7 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj +++ b/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj @@ -35,10 +35,13 @@ - + + + + diff --git a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj index 0642d4726..7408da953 100644 --- a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj +++ b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj @@ -25,11 +25,14 @@ - - + + + + + From 827907549122fc8d15484c2156e955bddb1febc7 Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Fri, 14 Mar 2025 15:21:35 -0700 Subject: [PATCH 5/6] Revert "Make Microsoft.Extensions.Http dependency framework friendly" This reverts commit 5082a1fa0c3bb144eb6bef5ef6bc796d6202a39e. --- .../AspNetCore/JwtBearerOptionsMerger.cs | 2 +- .../ConfidentialClientApplicationOptionsMerger.cs | 2 +- .../OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs | 2 +- .../OptionsMergers/MicrosoftIdentityOptionsMerger.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs index b47701737..d92481cc5 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/AspNetCore/JwtBearerOptionsMerger.cs @@ -18,7 +18,7 @@ public JwtBearerOptionsMerger(IMergedOptionsStore mergedOptions) private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs index f365e2c2b..017748a51 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/ConfidentialClientApplicationOptionsMerger.cs @@ -16,7 +16,7 @@ public ConfidentialClientApplicationOptionsMerger(IMergedOptionsStore mergedOpti private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs index bbea66eaa..89a88f228 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftAuthenticationOptionsMerger.cs @@ -16,7 +16,7 @@ public MicrosoftIdentityApplicationOptionsMerger(IMergedOptionsStore mergedOptio private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs index ecf0f87ae..99bfe3c4c 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs +++ b/src/Microsoft.Identity.Web.TokenAcquisition/OptionsMergers/MicrosoftIdentityOptionsMerger.cs @@ -15,7 +15,7 @@ public MicrosoftIdentityOptionsMerger(IMergedOptionsStore mergedOptions) private readonly IMergedOptionsStore _mergedOptionsMonitor; public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, From c1853f2f22dbd12ae7a6ad209e72e94860fe3da7 Mon Sep 17 00:00:00 2001 From: Kashif Mehmood Date: Fri, 14 Mar 2025 15:21:50 -0700 Subject: [PATCH 6/6] Revert "Add more missing files" This reverts commit ec75df02d799f5ff026f09d298abebeb52cc9a54. --- .../PublicAPI/net6.0/InternalAPI.Shipped.txt | 8 ++++---- src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs | 2 +- .../Policy/RequireScopeOrAppPermissionOptions.cs | 2 +- .../PublicAPI/net6.0/InternalAPI.Shipped.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt index a4236b121..705b63712 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt +++ b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Shipped.txt @@ -136,7 +136,7 @@ Microsoft.Identity.Web.ConfidentialClientApplicationBuilderExtension Microsoft.Identity.Web.ConfidentialClientApplicationBuilderExtension.Logger Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.ConfidentialClientApplicationOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Client.ConfidentialClientApplicationOptions! options) -> void +Microsoft.Identity.Web.ConfidentialClientApplicationOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Client.ConfidentialClientApplicationOptions! options) -> void Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider.CreateAuthorizationHeaderAsync(System.Collections.Generic.IEnumerable! scopes, Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions? downstreamApiOptions = null, System.Security.Claims.ClaimsPrincipal? claimsPrincipal = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! Microsoft.Identity.Web.DefaultAuthorizationHeaderProvider.CreateAuthorizationHeaderForAppAsync(string! scopes, Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions? downstreamApiOptions = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! @@ -177,7 +177,7 @@ Microsoft.Identity.Web.ITokenAcquisitionInternal.AddAccountToCacheFromAuthorizat Microsoft.Identity.Web.ITokenAcquisitionInternal.RemoveAccountAsync(System.Security.Claims.ClaimsPrincipal! user, string? authenticationScheme = null) -> System.Threading.Tasks.Task! Microsoft.Identity.Web.JwtBearerOptionsMerger Microsoft.Identity.Web.JwtBearerOptionsMerger.JwtBearerOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.JwtBearerOptionsMerger.PostConfigure(string? name, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions! options) -> void +Microsoft.Identity.Web.JwtBearerOptionsMerger.PostConfigure(string! name, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions! options) -> void Microsoft.Identity.Web.LoggingEventId Microsoft.Identity.Web.LoggingOptions Microsoft.Identity.Web.LoggingOptions.EnablePiiLogging.get -> bool @@ -226,12 +226,12 @@ Microsoft.Identity.Web.MergedOptionsStore.MergedOptionsStore() -> void Microsoft.Identity.Web.MicrosoftIdentityAppCallsWebApiAuthenticationBuilder.MicrosoftIdentityAppCallsWebApiAuthenticationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfigurationSection? configurationSection = null) -> void Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.MicrosoftIdentityApplicationOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Abstractions.MicrosoftIdentityApplicationOptions! options) -> void +Microsoft.Identity.Web.MicrosoftIdentityApplicationOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Abstractions.MicrosoftIdentityApplicationOptions! options) -> void Microsoft.Identity.Web.MicrosoftIdentityOptions.HasClientCredentials.get -> bool Microsoft.Identity.Web.MicrosoftIdentityOptions.IsB2C.get -> bool Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.MicrosoftIdentityOptionsMerger(Microsoft.Identity.Web.IMergedOptionsStore! mergedOptions) -> void -Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.PostConfigure(string? name, Microsoft.Identity.Web.MicrosoftIdentityOptions! options) -> void +Microsoft.Identity.Web.MicrosoftIdentityOptionsMerger.PostConfigure(string! name, Microsoft.Identity.Web.MicrosoftIdentityOptions! options) -> void Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory.GetHttpClient() -> System.Net.Http.HttpClient! Microsoft.Identity.Web.MsalAspNetCoreHttpClientFactory.MsalAspNetCoreHttpClientFactory(System.Net.Http.IHttpClientFactory! httpClientFactory) -> void diff --git a/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs b/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs index b64548287..bcc597067 100644 --- a/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs +++ b/src/Microsoft.Identity.Web/Policy/RequireScopeOptions.cs @@ -26,7 +26,7 @@ public RequireScopeOptions() /// public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs b/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs index e1bc75aa1..8bf557b6e 100644 --- a/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs +++ b/src/Microsoft.Identity.Web/Policy/RequireScopeOrAppPermissionOptions.cs @@ -26,7 +26,7 @@ public RequireScopeOrAppPermissionOptions() /// public void PostConfigure( -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER string? name, #else string name, diff --git a/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt b/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt index 4d4a6507f..367e03282 100644 --- a/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt +++ b/src/Microsoft.Identity.Web/PublicAPI/net6.0/InternalAPI.Shipped.txt @@ -48,10 +48,10 @@ Microsoft.Identity.Web.MicrosoftIdentityWebApiAuthenticationBuilderWithConfigura Microsoft.Identity.Web.MicrosoftIdentityWebAppAuthenticationBuilder.MicrosoftIdentityWebAppAuthenticationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! openIdConnectScheme, System.Action! configureMicrosoftIdentityOptions, Microsoft.Extensions.Configuration.IConfigurationSection? configurationSection) -> void Microsoft.Identity.Web.MicrosoftIdentityWebAppAuthenticationBuilderWithConfiguration.MicrosoftIdentityWebAppAuthenticationBuilderWithConfiguration(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! openIdConnectScheme, System.Action! configureMicrosoftIdentityOptions, Microsoft.Extensions.Configuration.IConfigurationSection! configurationSection) -> void Microsoft.Identity.Web.RequireScopeOptions -Microsoft.Identity.Web.RequireScopeOptions.PostConfigure(string? name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void +Microsoft.Identity.Web.RequireScopeOptions.PostConfigure(string! name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void Microsoft.Identity.Web.RequireScopeOptions.RequireScopeOptions() -> void Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions -Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.PostConfigure(string? name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void +Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.PostConfigure(string! name, Microsoft.AspNetCore.Authorization.AuthorizationOptions! options) -> void Microsoft.Identity.Web.RequireScopeOrAppPermissionOptions.RequireScopeOrAppPermissionOptions() -> void Microsoft.Identity.Web.Resource.RegisterValidAudience Microsoft.Identity.Web.Resource.RegisterValidAudience.RegisterAudienceValidation(Microsoft.IdentityModel.Tokens.TokenValidationParameters! validationParameters, Microsoft.Identity.Web.MicrosoftIdentityOptions! microsoftIdentityOptions) -> void