Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
66603086
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
66603086
编写于
8月 31, 2017
作者:
J
Julien Couvreur
提交者:
Nat Ayewah
9月 05, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Silently treat IncludePrivateMembers as true when emitting regular assemblies (#21359)
上级
1e85b99e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
5 deletion
+37
-5
src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs
src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs
+34
-3
src/Compilers/Core/Portable/Compilation/Compilation.cs
src/Compilers/Core/Portable/Compilation/Compilation.cs
+3
-2
未找到文件。
src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs
浏览文件 @
66603086
...
...
@@ -1595,6 +1595,36 @@ public class PublicClass
"System.Diagnostics.DebuggableAttribute"
},
compWithReal
.
SourceModule
.
GetReferencedAssemblySymbols
().
Last
().
GetAttributes
().
Select
(
a
=>
a
.
AttributeClass
.
ToTestDisplayString
()));
// Verify metadata (types, members, attributes) of the regular assembly with IncludePrivateMembers accidentally set to false.
// Note this can happen because of binary clients compiled against old EmitOptions ctor which had IncludePrivateMembers=false by default.
// In this case, IncludePrivateMembers is silently set to true when emitting
// See https://github.com/dotnet/roslyn/issues/20873
var
emitRegularWithoutPrivateMembers
=
EmitOptions
.
Default
.
WithIncludePrivateMembers
(
false
);
CompileAndVerify
(
comp
,
emitOptions
:
emitRegularWithoutPrivateMembers
,
verify
:
true
);
var
realImage2
=
comp
.
EmitToImageReference
(
emitRegularWithoutPrivateMembers
);
var
compWithReal2
=
CreateCompilation
(
""
,
references
:
new
[]
{
MscorlibRef
,
realImage2
},
options
:
TestOptions
.
DebugDll
.
WithMetadataImportOptions
(
MetadataImportOptions
.
All
));
AssertEx
.
Equal
(
new
[]
{
"<Module>"
,
"<>f__AnonymousType0<<anonymous>j__TPar>"
,
"PublicClass"
},
compWithReal2
.
SourceModule
.
GetReferencedAssemblySymbols
().
Last
().
GlobalNamespace
.
GetMembers
().
Select
(
m
=>
m
.
ToDisplayString
()));
AssertEx
.
Equal
(
new
[]
{
"void PublicClass.PublicMethod()"
,
"void PublicClass.PrivateMethod()"
,
"void PublicClass.ProtectedMethod()"
,
"void PublicClass.InternalMethod()"
,
"void PublicClass.PublicEvent.add"
,
"void PublicClass.PublicEvent.remove"
,
"void PublicClass.InternalEvent.add"
,
"void PublicClass.InternalEvent.remove"
,
"PublicClass..ctor()"
,
"event System.Action PublicClass.PublicEvent"
,
"event System.Action PublicClass.InternalEvent"
},
compWithReal2
.
GetMember
<
NamedTypeSymbol
>(
"PublicClass"
).
GetMembers
()
.
Select
(
m
=>
m
.
ToTestDisplayString
()));
AssertEx
.
Equal
(
new
[]
{
"System.Runtime.CompilerServices.CompilationRelaxationsAttribute"
,
"System.Runtime.CompilerServices.RuntimeCompatibilityAttribute"
,
"System.Diagnostics.DebuggableAttribute"
},
compWithReal2
.
SourceModule
.
GetReferencedAssemblySymbols
().
Last
().
GetAttributes
().
Select
(
a
=>
a
.
AttributeClass
.
ToTestDisplayString
()));
// verify metadata (types, members, attributes) of the metadata-only assembly
var
emitMetadataOnly
=
EmitOptions
.
Default
.
WithEmitMetadataOnly
(
true
);
CompileAndVerify
(
comp
,
emitOptions
:
emitMetadataOnly
,
verify
:
true
);
...
...
@@ -1950,15 +1980,16 @@ public void IncludePrivateMembers_DisallowMetadataPeStream()
}
[
Fact
]
public
void
MustIncludePrivateMembersUnlessRefAssembly
()
[
WorkItem
(
20873
,
"https://github.com/dotnet/roslyn/issues/20873"
)]
public
void
IncludePrivateMembersSilentlyAssumedTrueWhenEmittingRegular
()
{
CSharpCompilation
comp
=
CreateCompilation
(
""
,
references
:
new
[]
{
MscorlibRef
},
options
:
TestOptions
.
DebugDll
.
WithDeterministic
(
true
));
using
(
var
output
=
new
MemoryStream
())
{
Assert
.
Throws
<
ArgumentException
>(()
=>
comp
.
Emit
(
output
,
options
:
EmitOptions
.
Default
.
WithIncludePrivateMembers
(
false
)
));
// no exception
_
=
comp
.
Emit
(
output
,
options
:
EmitOptions
.
Default
.
WithIncludePrivateMembers
(
false
));
}
}
...
...
src/Compilers/Core/Portable/Compilation/Compilation.cs
浏览文件 @
66603086
...
...
@@ -2087,9 +2087,10 @@ internal void EnsureAnonymousTypeTemplates(CancellationToken cancellationToken)
throw
new
ArgumentException
(
CodeAnalysisResources
.
IncludingPrivateMembersUnexpectedWhenEmittingToMetadataPeStream
,
nameof
(
metadataPEStream
));
}
if
(
metadataPEStream
==
null
&&
options
?.
EmitMetadataOnly
==
false
&&
options
?.
IncludePrivateMembers
==
false
)
if
(
metadataPEStream
==
null
&&
options
?.
EmitMetadataOnly
==
false
)
{
throw
new
ArgumentException
(
CodeAnalysisResources
.
MustIncludePrivateMembersUnlessRefAssembly
,
nameof
(
options
.
IncludePrivateMembers
));
// EmitOptions used to default to IncludePrivateMembers=false, so to preserve binary compatibility we silently correct that unless emitting regular assemblies
options
=
options
.
WithIncludePrivateMembers
(
true
);
}
if
(
options
?.
DebugInformationFormat
==
DebugInformationFormat
.
Embedded
&&
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录