From feee0c025c83460efef42f6c3f7d03786d65e8a9 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:19:30 +0000 Subject: [PATCH 1/3] Update Directory.Packages.props --- Directory.Packages.props | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 938e1061..a7564a26 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,50 +5,50 @@ true - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + @@ -64,8 +64,8 @@ - - + + From aa5c96b165cfa25aa5eae149b7762cb440f5e553 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:20:36 +0000 Subject: [PATCH 2/3] Update SDK version from 10.0.403 to 10.0.404 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7207e940..953532d2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.403", + "version": "10.0.404", "rollForward": "latestMajor" } } From ac4290040c773bef2c0b020e12d3827f99cb40c0 Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Thu, 12 Nov 2026 14:32:38 +0000 Subject: [PATCH 3/3] Fix nullable logging matchers for Moq 4.21 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../FeatureGatesConsolidatorTests.cs | 2 +- tests/FeatureManagement.UnitTests/FeatureGatesServiceTests.cs | 2 +- .../Filters/CampaignFilterTests.cs | 4 ++-- .../Filters/IPAddressFilterTests.cs | 4 ++-- .../FeatureManagement.UnitTests/Filters/MarketFilterTests.cs | 4 ++-- .../FeatureManagement.UnitTests/Filters/ParentFilterTests.cs | 2 +- .../FeatureManagement.UnitTests/Filters/ToggleFilterTests.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/FeatureManagement.UnitTests/FeatureGatesConsolidatorTests.cs b/tests/FeatureManagement.UnitTests/FeatureGatesConsolidatorTests.cs index d2058ea3..f613d0fb 100644 --- a/tests/FeatureManagement.UnitTests/FeatureGatesConsolidatorTests.cs +++ b/tests/FeatureManagement.UnitTests/FeatureGatesConsolidatorTests.cs @@ -307,7 +307,7 @@ private void VerifyLoggerCalled(LogLevel logLevel, string expectedMessage) => x => x.Log( logLevel, It.IsAny(), - It.Is((v, t) => v.ToString()!.Contains(expectedMessage)), + It.Is((v, t) => v != null && v.ToString()!.Contains(expectedMessage)), It.IsAny(), It.IsAny>()), Times.AtLeastOnce); diff --git a/tests/FeatureManagement.UnitTests/FeatureGatesServiceTests.cs b/tests/FeatureManagement.UnitTests/FeatureGatesServiceTests.cs index 00e5a22d..b8101867 100644 --- a/tests/FeatureManagement.UnitTests/FeatureGatesServiceTests.cs +++ b/tests/FeatureManagement.UnitTests/FeatureGatesServiceTests.cs @@ -145,7 +145,7 @@ public async Task GetExperimentalFeaturesAsync_WhenCalled_LogsFiltersCorrectly() x => x.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => v.ToString()!.Contains("CustomerId:12345") && v.ToString()!.Contains("Market:US")), + It.Is((v, t) => v != null && v.ToString()!.Contains("CustomerId:12345") && v.ToString()!.Contains("Market:US")), It.IsAny(), It.IsAny>()), Times.Once); diff --git a/tests/FeatureManagement.UnitTests/Filters/CampaignFilterTests.cs b/tests/FeatureManagement.UnitTests/Filters/CampaignFilterTests.cs index 37222a3f..dccbdb90 100644 --- a/tests/FeatureManagement.UnitTests/Filters/CampaignFilterTests.cs +++ b/tests/FeatureManagement.UnitTests/Filters/CampaignFilterTests.cs @@ -358,7 +358,7 @@ private void VerifyIncludedLogging(bool expectedIsEnabled) => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"CampaignFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as campaign is included.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"CampaignFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as campaign is included.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); @@ -368,7 +368,7 @@ private void VerifyExcludedLogging() => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"CampaignFilter returning false for '{TestFeatureName}' as campaign is excluded.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"CampaignFilter returning false for '{TestFeatureName}' as campaign is excluded.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); diff --git a/tests/FeatureManagement.UnitTests/Filters/IPAddressFilterTests.cs b/tests/FeatureManagement.UnitTests/Filters/IPAddressFilterTests.cs index 03d9b029..7fec18e9 100644 --- a/tests/FeatureManagement.UnitTests/Filters/IPAddressFilterTests.cs +++ b/tests/FeatureManagement.UnitTests/Filters/IPAddressFilterTests.cs @@ -427,7 +427,7 @@ private void VerifyLogging(bool expectedIsEnabled) => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"IPAddressFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"IPAddressFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); @@ -439,7 +439,7 @@ private void VerifyIPRangeLogging(bool isAllowed) logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"IPAddressFilter '{verb}' access to '{TestFeatureName}'.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"IPAddressFilter '{verb}' access to '{TestFeatureName}'.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); diff --git a/tests/FeatureManagement.UnitTests/Filters/MarketFilterTests.cs b/tests/FeatureManagement.UnitTests/Filters/MarketFilterTests.cs index b977b601..468476cb 100644 --- a/tests/FeatureManagement.UnitTests/Filters/MarketFilterTests.cs +++ b/tests/FeatureManagement.UnitTests/Filters/MarketFilterTests.cs @@ -358,7 +358,7 @@ private void VerifyIncludedLogging(bool expectedIsEnabled) => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"MarketFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as market is included.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"MarketFilter returning '{expectedIsEnabled}' for '{TestFeatureName}' as market is included.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); @@ -368,7 +368,7 @@ private void VerifyExcludedLogging() => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"MarketFilter returning false for '{TestFeatureName}' as market is excluded.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"MarketFilter returning false for '{TestFeatureName}' as market is excluded.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once); diff --git a/tests/FeatureManagement.UnitTests/Filters/ParentFilterTests.cs b/tests/FeatureManagement.UnitTests/Filters/ParentFilterTests.cs index a96bc6a4..edc9b293 100644 --- a/tests/FeatureManagement.UnitTests/Filters/ParentFilterTests.cs +++ b/tests/FeatureManagement.UnitTests/Filters/ParentFilterTests.cs @@ -236,7 +236,7 @@ private void VerifyErrorLogging() => logger => logger.Log( LogLevel.Error, It.IsAny(), - It.Is((v, t) => v.ToString()!.Contains("ParentFilter could not resolve the IExtendedFeatureManager object")), + It.Is((v, t) => v != null && v.ToString()!.Contains("ParentFilter could not resolve the IExtendedFeatureManager object")), It.IsAny(), It.IsAny>()), Times.Once); diff --git a/tests/FeatureManagement.UnitTests/Filters/ToggleFilterTests.cs b/tests/FeatureManagement.UnitTests/Filters/ToggleFilterTests.cs index 38f1ee53..3c93cfb0 100644 --- a/tests/FeatureManagement.UnitTests/Filters/ToggleFilterTests.cs +++ b/tests/FeatureManagement.UnitTests/Filters/ToggleFilterTests.cs @@ -117,7 +117,7 @@ private void VerifyLogging(bool expectedIsEnabled) => logger => logger.Log( LogLevel.Information, It.IsAny(), - It.Is((v, t) => string.Equals(v.ToString(), $"ToggleFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)), + It.Is((v, t) => v != null && string.Equals(v.ToString(), $"ToggleFilter returning '{expectedIsEnabled}' for '{TestFeatureName}'.", StringComparison.Ordinal)), It.IsAny(), It.IsAny>()), Times.Once);