From 440dfe4a7beecd7755767aa247f47af00b119383 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Mon, 7 Mar 2022 17:45:01 -0500 Subject: [PATCH] Revisiting nullable annotations on caching (#66215) * Revisiting nullable annotations on caching * Fix up more nullablity mismatches --- .../ref/Microsoft.Extensions.Caching.Memory.cs | 2 +- .../ref/Microsoft.Extensions.Configuration.Binder.cs | 2 +- .../ref/Microsoft.Extensions.Primitives.cs | 2 +- src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs index e7b28d2..e61a5b0 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs @@ -27,6 +27,7 @@ namespace Microsoft.Extensions.Caching.Memory public MemoryCache(Microsoft.Extensions.Options.IOptions optionsAccessor) { } public MemoryCache(Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } public int Count { get { throw null; } } + public void Clear() { } public void Compact(double percentage) { } public Microsoft.Extensions.Caching.Memory.ICacheEntry CreateEntry(object key) { throw null; } public void Dispose() { } @@ -34,7 +35,6 @@ namespace Microsoft.Extensions.Caching.Memory ~MemoryCache() { } public void Remove(object key) { } public bool TryGetValue(object key, out object? result) { throw null; } - public void Clear() { } } public partial class MemoryCacheOptions : Microsoft.Extensions.Options.IOptions { diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs index efcb740..d42ef62 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.cs @@ -27,7 +27,7 @@ namespace Microsoft.Extensions.Configuration [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("In case the type is non-primitive, the trimmer cannot statically analyze the object's type so its members may be trimmed.")] public static object? GetValue(this Microsoft.Extensions.Configuration.IConfiguration configuration, [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type type, string key) { throw null; } [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("In case the type is non-primitive, the trimmer cannot statically analyze the object's type so its members may be trimmed.")] - public static object? GetValue(this Microsoft.Extensions.Configuration.IConfiguration configuration, [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type type, string key, object defaultValue) { throw null; } + public static object? GetValue(this Microsoft.Extensions.Configuration.IConfiguration configuration, [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] System.Type type, string key, object? defaultValue) { throw null; } [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("In case the type is non-primitive, the trimmer cannot statically analyze the object's type so its members may be trimmed.")] public static T? GetValue<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] T>(this Microsoft.Extensions.Configuration.IConfiguration configuration, string key) { throw null; } [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("In case the type is non-primitive, the trimmer cannot statically analyze the object's type so its members may be trimmed.")] diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs index afa9bc3..5811822 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.cs @@ -180,7 +180,7 @@ namespace Microsoft.Extensions.Primitives private int _dummyPrimitive; public Enumerator(ref Microsoft.Extensions.Primitives.StringValues values) { throw null; } public string? Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } + object? System.Collections.IEnumerator.Current { get { throw null; } } public void Dispose() { } public bool MoveNext() { throw null; } void System.Collections.IEnumerator.Reset() { } diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs b/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs index 029b692..f50fa82 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs +++ b/src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs @@ -638,7 +638,7 @@ namespace Microsoft.Extensions.Primitives /// The to compare. /// The to compare. /// true if the value of is different to the value of ; otherwise, false. - public static bool operator !=(string left, StringValues right) => !Equals(new StringValues(left), right); + public static bool operator !=(string? left, StringValues right) => !Equals(new StringValues(left), right); /// public static bool operator ==(StringValues left, string?[]? right) => Equals(left, new StringValues(right)); -- 2.7.4