Skip to content

Merge change from main into preview #492

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
merged 1 commit into from
Sep 9, 2024
Merged

Merge change from main into preview #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions src/Microsoft.FeatureManagement/FeatureFilters/ISystemClock.cs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/Microsoft.FeatureManagement/FeatureFilters/TimeWindowFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public TimeWindowFilter(ILoggerFactory loggerFactory = null)
/// <summary>
/// This property allows the time window filter in our test suite to use simulated time.
/// </summary>
internal ISystemClock SystemClock { get; set; }
internal TimeProvider SystemClock { get; set; }

/// <summary>
/// Binds configuration representing filter parameters to <see cref="TimeWindowFilterSettings"/>.
Expand Down Expand Up @@ -74,7 +74,7 @@ public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context)
// Check if prebound settings available, otherwise bind from parameters.
TimeWindowFilterSettings settings = (TimeWindowFilterSettings)context.Settings ?? (TimeWindowFilterSettings)BindParameters(context.Parameters);

DateTimeOffset now = SystemClock?.UtcNow ?? DateTimeOffset.UtcNow;
DateTimeOffset now = SystemClock?.GetUtcNow() ?? DateTimeOffset.UtcNow;

if (!settings.Start.HasValue && !settings.End.HasValue)
{
Expand Down Expand Up @@ -129,7 +129,7 @@ public Task<bool> EvaluateAsync(FeatureFilterEvaluationContext context)

private DateTimeOffset? ReloadClosestStart(TimeWindowFilterSettings settings)
{
DateTimeOffset now = SystemClock?.UtcNow ?? DateTimeOffset.UtcNow;
DateTimeOffset now = SystemClock?.GetUtcNow() ?? DateTimeOffset.UtcNow;

DateTimeOffset? closestStart = RecurrenceEvaluator.CalculateClosestStart(now, settings);

Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.FeatureManagement/Microsoft.FeatureManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.10" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
Expand Down
10 changes: 7 additions & 3 deletions tests/Tests.FeatureManagement/OnDemandClock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
using Microsoft.FeatureManagement.FeatureFilters;
using System;
using System;

namespace Tests.FeatureManagement
{
class OnDemandClock : ISystemClock
class OnDemandClock : TimeProvider
{
public DateTimeOffset UtcNow { get; set; }

public override DateTimeOffset GetUtcNow()
{
return UtcNow;
}
}
}