Skip to content

Bump foss project references. #2385

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
Erwinvandervalk merged 2 commits into from
Mar 13, 2026
Merged

Bump foss project references. #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5296e
Bump foss project references and extensions.
damianh Mar 13, 2026
8752ab5
add retries for the flakey FrontendCountDiagnosticEntryTests
Erwinvandervalk Mar 13, 2026
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
54 changes: 27 additions & 27 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ that supports the target frameworks our products target (8, 9, 10) -->
<IdentityModelVersion>8.0.1</IdentityModelVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0'">
<FrameworkVersion>10.0.0</FrameworkVersion>
<FrameworkVersion>10.0.4</FrameworkVersion>
<EFCoreVersion>10.0.0</EFCoreVersion>
<IdentityEFCoreVersion>10.0.0</IdentityEFCoreVersion>
<MvcRazorRuntimeCompilationVersion>10.0.0</MvcRazorRuntimeCompilationVersion>
<AuthenticationCertificateVersion>10.0.0</AuthenticationCertificateVersion>
<MvcRazorRuntimeCompilationVersion>10.0.4</MvcRazorRuntimeCompilationVersion>
<AuthenticationCertificateVersion>10.0.4</AuthenticationCertificateVersion>
<IdentityModelVersion>8.0.1</IdentityModelVersion>
</PropertyGroup>
<ItemGroup>
Expand All @@ -38,11 +38,11 @@ that supports the target frameworks our products target (8, 9, 10) -->
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<!-- Added aspire transitive package to resolve package vulnerability -->
<PackageVersion Include="KubernetesClient" Version="17.0.14" />
<PackageVersion Include="Duende.AccessTokenManagement" Version="4.1.0" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.0" />
<PackageVersion Include="Duende.AccessTokenManagement" Version="4.1.2" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.2" />
<PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="0.3.0" />
<PackageVersion Include="Duende.IdentityModel" Version="8.0.0" />
<PackageVersion Include="Duende.IdentityModel.OidcClient" Version="7.0.0" />
<PackageVersion Include="Duende.IdentityModel" Version="8.0.1" />
<PackageVersion Include="Duende.IdentityModel.OidcClient" Version="7.0.1" />
<PackageVersion Include="Duende.IdentityServer" Version="7.4.0-preview.2" />
<PackageVersion Include="Duende.Private.Licensing" Version="1.0.0" />
<PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
Expand All @@ -69,25 +69,25 @@ that supports the target frameworks our products target (8, 9, 10) -->
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Testing" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.4.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(IdentityModelVersion)" />
<PackageVersion Include="Microsoft.IdentityModel.Logging" Version="$(IdentityModelVersion)" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelVersion)" />
Expand Down Expand Up @@ -137,4 +137,4 @@ that supports the target frameworks our products target (8, 9, 10) -->
<PackageVersion Include="Vogen" Version="7.0.3" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
</ItemGroup>
</Project>
</Project>
10 changes: 2 additions & 8 deletions bff/test/Bff.Tests/Diagnostics/FrontendCountDiagnosticEntryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ public async Task Should_print_the_number_of_frontends_during_defined_interval()

AdvanceClock(TimeSpan.FromHours(1));

await Task.Delay(100);

var bffLogMessages = Context.LogMessages.ToString().Split(Environment.NewLine).Where(x => x.StartsWith("bff"));
bffLogMessages.ShouldContain(x => x.Contains("\"FrontendCount\":0"));
await WaitForLogMessage("\"FrontendCount\":0");

AddOrUpdateFrontend(new BffFrontend
{
Expand All @@ -37,9 +34,6 @@ public async Task Should_print_the_number_of_frontends_during_defined_interval()

AdvanceClock(TimeSpan.FromHours(1));

await Task.Delay(100);

bffLogMessages = Context.LogMessages.ToString().Split(Environment.NewLine).Where(x => x.StartsWith("bff"));
bffLogMessages.ShouldContain(x => x.Contains("\"FrontendCount\":2"));
await WaitForLogMessage("\"FrontendCount\":2");
}
}
23 changes: 23 additions & 0 deletions bff/test/Bff.Tests/TestInfra/BffTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,28 @@ private void AddCustomUserClaims(OpenIdConnectOptions opt) =>
};

protected void AdvanceClock(TimeSpan by) => The.Clock.SetUtcNow(The.Clock.GetUtcNow().Add(by));

protected async Task WaitForLogMessage(string expected, int maxRetries = 20, int delayMs = 100)
{
for (var i = 0; i < maxRetries; i++)
{
var bffLogMessages = Context.LogMessages.ToString()
.Split(Environment.NewLine)
.Where(x => x.StartsWith("bff"));

if (bffLogMessages.Any(x => x.Contains(expected)))
{
return;
}

await Task.Delay(delayMs);
}

// Final assertion to produce a clear failure message
var finalMessages = Context.LogMessages.ToString()
.Split(Environment.NewLine)
.Where(x => x.StartsWith("bff"));
finalMessages.ShouldContain(x => x.Contains(expected));
}
}

Loading