Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 38 additions & 38 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,50 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup Label="Latest DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(LatestSupportedDotNetVersion)' OR '$(IsNetStandard)'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="10.0.14" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.15" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="10.0.15" PreserveMajor="true" />
</ItemGroup>
<ItemGroup Label="Previous DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(OldestSupportedDotNetVersion)' And '$(OldestSupportedDotNetVersion)' != '$(LatestSupportedDotNetVersion)'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="9.0.22" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.23" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="9.0.23" PreserveMajor="true" />
</ItemGroup>
<ItemGroup Label="Package Versions. AutoUpdate">
<PackageVersion Include="MSTest" Version="4.5.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="5.9.0" />
<PackageVersion Include="Microsoft.FeatureManagement" Version="4.8.0" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.403" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.403" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.404" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.404" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Linq.Async" Version="7.0.1" />
Expand All @@ -64,8 +64,8 @@
<PackageVersion Include="Microsoft.ServiceFabric.Services.Remoting" Version="8.8.121" />
<PackageVersion Include="ServiceFabric.Mocks" Version="8.1.3" />
</ItemGroup>
<ItemGroup Label="Moq pinned to 4.20.72, Moq updates are reviewed and made manually.">
<PackageVersion Include="Moq" Version="4.20.72" />
<ItemGroup Label="Moq pinned to 4.21.0, Moq updates are reviewed and made manually.">
<PackageVersion Include="Moq" Version="4.21.0" />
</ItemGroup>
</Project>

2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.403",
"version": "10.0.404",
"rollForward": "latestMajor"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ private void VerifyLoggerCalled(LogLevel logLevel, string expectedMessage) =>
x => x.Log(
logLevel,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => v.ToString()!.Contains(expectedMessage)),
It.Is<It.IsAnyType>((v, t) => v != null && v.ToString()!.Contains(expectedMessage)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.AtLeastOnce);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public async Task GetExperimentalFeaturesAsync_WhenCalled_LogsFiltersCorrectly()
x => x.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => v.ToString()!.Contains("CustomerId:12345") && v.ToString()!.Contains("Market:US")),
It.Is<It.IsAnyType>((v, t) => v != null && v.ToString()!.Contains("CustomerId:12345") && v.ToString()!.Contains("Market:US")),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private void VerifyIncludedLogging(bool expectedIsEnabled) =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"CampaignFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as campaign is included.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"CampaignFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as campaign is included.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand All @@ -368,7 +368,7 @@ private void VerifyExcludedLogging() =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"CampaignFilter returning false for '{TestFeatureName}' as campaign is excluded.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"CampaignFilter returning false for '{TestFeatureName}' as campaign is excluded.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ private void VerifyLogging(bool expectedIsEnabled) =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"IPAddressFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"IPAddressFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand All @@ -439,7 +439,7 @@ private void VerifyIPRangeLogging(bool isAllowed)
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"IPAddressFilter '{verb}' access to '{TestFeatureName}'.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"IPAddressFilter '{verb}' access to '{TestFeatureName}'.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private void VerifyIncludedLogging(bool expectedIsEnabled) =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"MarketFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as market is included.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"MarketFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as market is included.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand All @@ -368,7 +368,7 @@ private void VerifyExcludedLogging() =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"MarketFilter returning false for '{TestFeatureName}' as market is excluded.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"MarketFilter returning false for '{TestFeatureName}' as market is excluded.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ private void VerifyErrorLogging() =>
logger => logger.Log(
LogLevel.Error,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => v.ToString()!.Contains("ParentFilter could not resolve the IExtendedFeatureManager object")),
It.Is<It.IsAnyType>((v, t) => v != null && v.ToString()!.Contains("ParentFilter could not resolve the IExtendedFeatureManager object")),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void VerifyLogging(bool expectedIsEnabled) =>
logger => logger.Log(
LogLevel.Information,
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => string.Equals(v.ToString(), $"ToggleFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)),
It.Is<It.IsAnyType>((v, t) => v != null && string.Equals(v.ToString(), $"ToggleFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)),
It.IsAny<Exception>(),
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
Times.Once);
Expand Down
Loading