Skip to content

Fix IL warnings in AddDownstreamApis method #3355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GeoK merged 7 commits into from
May 13, 2025
Merged

Fix IL warnings in AddDownstreamApis method #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f706383
EnableConfigurationBindingGenerator only on .NET Core targets
GeoK May 8, 2025
8e2fe42
Capture var on a separate line as IL warning workaround
GeoK May 9, 2025
4c1ff4d
CLRF -> LF
GeoK May 9, 2025
742cd4c
minor fixes
GeoK May 9, 2025
c70a504
Adjust the fix
GeoK May 13, 2025
e2a1ea0
Adjust the fix
GeoK May 13, 2025
acc79f8
Adjust warnings count
GeoK May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/test-aot.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ foreach ($line in $($publishOutput -split "`r`n"))
}

Write-Host "Actual warning count is: ", $actualWarningCount
$expectedWarningCount = 61
$expectedWarningCount = 65

if ($LastExitCode -ne 0)
{
Expand Down
15 changes: 9 additions & 6 deletions src/Microsoft.Identity.Web.DownstreamApi/DownstreamApiExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,15 @@ public static IServiceCollection AddDownstreamApis(
_ = Throws.IfNull(services);

Dictionary<string, DownstreamApiOptions> options = new();
configurationSection.Bind(options);

foreach (var optionsForService in options.Keys)
{
services.Configure<DownstreamApiOptions>(optionsForService, configurationSection.GetSection(optionsForService).Bind);
}
configurationSection.Bind(options);

foreach (var optionsForService in options.Keys)
{
// lambda expression is needed as a workaround for IL2026 and IL3050 so the ConfigBinder Source Generator works
// https://github.com/dotnet/aspire/blob/2ed738cb524f7ce82490f0da33a1ea3e194011e8/src/Components/Aspire.Azure.Messaging.ServiceBus/AspireServiceBusExtensions.cs#L105
IConfigurationSection optionsForServiceSection = configurationSection.GetSection(optionsForService);
services.Configure<DownstreamApiOptions>(optionsForService, bindOptions => optionsForServiceSection.Bind(bindOptions));
}
RegisterDownstreamApi(services);
return services;
}
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Identity.Web.DownstreamApi/Microsoft.Identity.Web.DownstreamApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<Product>Microsoft Identity Web downstream API</Product>
<Description>Interface for higher level API for confidential client applications.</Description>
<ProjectGuid>{A123BD94-812D-40EC-9576-1A7AB5C59913}</ProjectGuid>
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\README.md">
<Pack>True</Pack>
Expand Down
Loading