Skip to content

Fix nullability in IOptionsMonitor #65225

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
eerhardt merged 2 commits into from
Feb 12, 2022
Merged

Fix nullability in IOptionsMonitor #65225

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
e7a7bbd
Update IOptionsMonitor
maxkoshevoi Feb 11, 2022
0dbfadb
Update OptionsMonitorExtensions
maxkoshevoi Feb 11, 2022
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
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public partial interface IOptionsMonitor<[System.Diagnostics.CodeAnalysis.Dynami
{
TOptions CurrentValue { get; }
TOptions Get(string? name);
System.IDisposable OnChange(System.Action<TOptions, string?> listener);
System.IDisposable? OnChange(System.Action<TOptions, string?> listener);
}
public partial interface IOptionsSnapshot<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] out TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class
{
Expand Down Expand Up @@ -197,7 +197,7 @@ public OptionsManager(Microsoft.Extensions.Options.IOptionsFactory<TOptions> fac
}
public static partial class OptionsMonitorExtensions
{
public static System.IDisposable OnChange<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TOptions>(this Microsoft.Extensions.Options.IOptionsMonitor<TOptions> monitor, System.Action<TOptions> listener) { throw null; }
public static System.IDisposable? OnChange<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TOptions>(this Microsoft.Extensions.Options.IOptionsMonitor<TOptions> monitor, System.Action<TOptions> listener) { throw null; }
}
public partial class OptionsMonitor<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TOptions> : Microsoft.Extensions.Options.IOptionsMonitor<TOptions>, System.IDisposable where TOptions : class
{
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Options/src/IOptionsMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ public interface IOptionsMonitor<[DynamicallyAccessedMembers(Options.Dynamically
/// </summary>
/// <param name="listener">The action to be invoked when <typeparamref name="TOptions"/> has changed.</param>
/// <returns>An <see cref="IDisposable"/> which should be disposed to stop listening for changes.</returns>
IDisposable OnChange(Action<TOptions, string?> listener);
IDisposable? OnChange(Action<TOptions, string?> listener);
}
}
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Options/src/OptionsMonitorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static class OptionsMonitorExtensions
/// <param name="monitor">The IOptionsMonitor.</param>
/// <param name="listener">The action to be invoked when <typeparamref name="TOptions"/> has changed.</param>
/// <returns>An <see cref="IDisposable"/> which should be disposed to stop listening for changes.</returns>
public static IDisposable OnChange<[DynamicallyAccessedMembers(Options.DynamicallyAccessedMembers)] TOptions>(
public static IDisposable? OnChange<[DynamicallyAccessedMembers(Options.DynamicallyAccessedMembers)] TOptions>(
this IOptionsMonitor<TOptions> monitor,
Action<TOptions> listener)
=> monitor.OnChange((o, _) => listener(o));
Expand Down