Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
fc7da6e5
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fc7da6e5
编写于
4月 01, 2022
作者:
M
Maksym Koshovyi
提交者:
GitHub
4月 01, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Group 6] Enable nullable annotations for Microsoft.Extensions.Logging.Configuration (#67174)
上级
779de9bf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
12 deletion
+9
-12
src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
...ion/ref/Microsoft.Extensions.Logging.Configuration.csproj
+1
-0
src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerFilterConfigureOptions.cs
...Logging.Configuration/src/LoggerFilterConfigureOptions.cs
+4
-4
src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerProviderConfigurationFactory.cs
...g.Configuration/src/LoggerProviderConfigurationFactory.cs
+3
-8
src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
...ion/src/Microsoft.Extensions.Logging.Configuration.csproj
+1
-0
未找到文件。
src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
浏览文件 @
fc7da6e5
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
...
...
src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerFilterConfigureOptions.cs
浏览文件 @
fc7da6e5
...
...
@@ -57,13 +57,13 @@ private void LoadDefaultConfigValues(LoggerFilterOptions options)
bool
GetCaptureScopesValue
(
LoggerFilterOptions
options
)
=>
_configuration
.
GetValue
(
nameof
(
options
.
CaptureScopes
),
options
.
CaptureScopes
);
}
private
static
void
LoadRules
(
LoggerFilterOptions
options
,
IConfigurationSection
configurationSection
,
string
logger
)
private
static
void
LoadRules
(
LoggerFilterOptions
options
,
IConfigurationSection
configurationSection
,
string
?
logger
)
{
foreach
(
System
.
Collections
.
Generic
.
KeyValuePair
<
string
,
string
>
section
in
configurationSection
.
AsEnumerable
(
true
))
foreach
(
System
.
Collections
.
Generic
.
KeyValuePair
<
string
,
string
?
>
section
in
configurationSection
.
AsEnumerable
(
true
))
{
if
(
TryGetSwitch
(
section
.
Value
,
out
LogLevel
level
))
{
string
category
=
section
.
Key
;
string
?
category
=
section
.
Key
;
if
(
category
.
Equals
(
DefaultCategory
,
StringComparison
.
OrdinalIgnoreCase
))
{
category
=
null
;
...
...
@@ -74,7 +74,7 @@ private static void LoadRules(LoggerFilterOptions options, IConfigurationSection
}
}
private
static
bool
TryGetSwitch
(
string
value
,
out
LogLevel
level
)
private
static
bool
TryGetSwitch
(
string
?
value
,
out
LogLevel
level
)
{
if
(
string
.
IsNullOrEmpty
(
value
))
{
...
...
src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerProviderConfigurationFactory.cs
浏览文件 @
fc7da6e5
...
...
@@ -16,15 +16,10 @@ public LoggerProviderConfigurationFactory(IEnumerable<LoggingConfiguration> conf
_configurations
=
configurations
;
}
public
IConfiguration
GetConfiguration
(
Type
providerType
)
public
IConfiguration
GetConfiguration
(
Type
providerType
!!
)
{
if
(
providerType
==
null
)
{
throw
new
ArgumentNullException
(
nameof
(
providerType
));
}
string
fullName
=
providerType
.
FullName
;
string
alias
=
ProviderAliasUtilities
.
GetAlias
(
providerType
);
string
fullName
=
providerType
.
FullName
!;
string
?
alias
=
ProviderAliasUtilities
.
GetAlias
(
providerType
);
var
configurationBuilder
=
new
ConfigurationBuilder
();
foreach
(
LoggingConfiguration
configuration
in
_configurations
)
{
...
...
src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
浏览文件 @
fc7da6e5
...
...
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<Nullable>enable</Nullable>
<EnableDefaultItems>true</EnableDefaultItems>
<!-- Use targeting pack references instead of granular ones in the project file. -->
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录