Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ad2ea3d
Annotate src
maxkoshevoi Aug 14, 2021
04bc30b
Annotate ref
maxkoshevoi Aug 14, 2021
65f47b2
Add net6 to Configuration.Abstractions
maxkoshevoi Aug 14, 2021
44d0ac0
Fix tests
maxkoshevoi Aug 14, 2021
1226d7e
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Aug 15, 2021
07cc6a8
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Aug 15, 2021
802a753
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Aug 16, 2021
051b15b
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Aug 26, 2021
5a7a6d3
DisableImplicitAssemblyReferences
maxkoshevoi Aug 26, 2021
9bde07c
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Sep 8, 2021
4945112
TryGet can return null
maxkoshevoi Sep 16, 2021
330dc3a
Merge branch 'main' into mk/43605-Configuration
maxkoshevoi Sep 16, 2021
f320ed0
new()
maxkoshevoi Sep 16, 2021
7cbd323
Merge remote-tracking branch 'upstream/main' into mk/43605-Configuration
eerhardt Oct 6, 2021
b9a0a93
Fix merge error
eerhardt Oct 6, 2021
e5228aa
InvalidOperationException
maxkoshevoi Oct 7, 2021
1c583ec
Source.Stream DisallowNull
maxkoshevoi Oct 7, 2021
a45a821
Revert unnecessary changes
maxkoshevoi Oct 8, 2021
d33438a
More message into resources
maxkoshevoi Oct 8, 2021
2ca692a
Configuration DisallowNull
maxkoshevoi Oct 8, 2021
4813528
MaybeNullWhen(false)
maxkoshevoi Oct 8, 2021
581c024
Revert "MaybeNullWhen(false)"
maxkoshevoi Oct 8, 2021
ff9af93
Remove MaybeNullWhen
maxkoshevoi Oct 11, 2021
3790ba6
NotNullWhen
maxkoshevoi Oct 11, 2021
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
Prev Previous commit
Next Next commit
Revert "MaybeNullWhen(false)"
This reverts commit 4813528.
  • Loading branch information
maxkoshevoi committed Oct 8, 2021
commit 581c024a9d292fca67a4ebd54788cf1d2ab446ec
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public partial interface IConfigurationProvider
Microsoft.Extensions.Primitives.IChangeToken GetReloadToken();
void Load();
void Set(string key, string? value);
bool TryGet(string key, [System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)] out string value);
bool TryGet(string key, out string? value);
}
public partial interface IConfigurationRoot : Microsoft.Extensions.Configuration.IConfiguration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Primitives;

namespace Microsoft.Extensions.Configuration
Expand All @@ -18,7 +17,7 @@ public interface IConfigurationProvider
/// <param name="key">The key.</param>
/// <param name="value">The value.</param>
/// <returns><c>True</c> if a value for the specified key was found, otherwise <c>false</c>.</returns>
bool TryGet(string key, [MaybeNullWhen(false)] out string value);
bool TryGet(string key, out string? value);

/// <summary>
/// Sets a configuration value for the specified key.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public virtual void Load() { }
protected void OnReload() { }
public virtual void Set(string key, string? value) { }
public override string ToString() { throw null; }
public virtual bool TryGet(string key, [System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)] out string value) { throw null; }
public virtual bool TryGet(string key, out string? value) { throw null; }
}
public partial class ConfigurationReloadToken : Microsoft.Extensions.Primitives.IChangeToken
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using Microsoft.Extensions.Primitives;

Expand Down Expand Up @@ -36,7 +35,7 @@ protected ConfigurationProvider()
/// <param name="key">The key to lookup.</param>
/// <param name="value">The value found at key if one is found.</param>
/// <returns>True if key has a value, false otherwise.</returns>
public virtual bool TryGet(string key, [MaybeNullWhen(false)] out string value)
public virtual bool TryGet(string key, out string? value)
=> Data.TryGetValue(key, out value);

/// <summary>
Expand Down