Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
613a30c5
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,发现更多精彩内容 >>
提交
613a30c5
编写于
12月 02, 2015
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7187 from jaredpar/bugs
Fix test issues
上级
46920402
7f233151
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
19 deletion
+7
-19
src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Assembly.cs
...rs/CSharp/Test/Emit/Attributes/AttributeTests_Assembly.cs
+5
-17
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
+1
-1
src/Test/Utilities/Desktop/HostedRuntimeEnvironment.cs
src/Test/Utilities/Desktop/HostedRuntimeEnvironment.cs
+1
-1
未找到文件。
src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Assembly.cs
浏览文件 @
613a30c5
...
...
@@ -225,7 +225,7 @@ public void NulCharInAssemblyCultureAttribute()
Diagnostic
(
ErrorCode
.
ERR_InvalidAssemblyCulture
,
@"""\0"""
).
WithLocation
(
1
,
55
));
}
[
Fact
(
Skip
=
"Issue #321"
)
]
[
Fact
]
public
void
CultureAttributeMismatch
()
{
var
neutral
=
CreateCompilationWithMscorlib
(
...
...
@@ -280,7 +280,7 @@ void M(de x)
compilation
=
CreateCompilationWithMscorlib
(
""
,
new
MetadataReference
[]
{
compilation
.
EmitToImageReference
()
},
TestOptions
.
ReleaseDll
,
assemblyName
:
assemblyNameBase
+
"20"
);
CompileAndVerify
(
compilation
).
VerifyDiagnostics
(
CompileAndVerify
(
compilation
,
verify
:
false
).
VerifyDiagnostics
(
// warning CS8009: Referenced assembly 'de, Version=0.0.0.0, Culture=de, PublicKeyToken=null' has different culture setting of 'de'.
Diagnostic
(
ErrorCode
.
WRN_RefCultureMismatch
).
WithArguments
(
"de, Version=0.0.0.0, Culture=de, PublicKeyToken=null"
,
"de"
)
);
...
...
@@ -329,19 +329,6 @@ void M(neutral x)
compilation
=
CreateCompilationWithMscorlib
(
""
,
new
MetadataReference
[]
{
compilation
.
EmitToImageReference
()
},
TestOptions
.
ReleaseDll
,
assemblyName
:
assemblyNameBase
+
"40"
);
CompileAndVerify
(
compilation
,
// TODO: KevinH - I'm not sure why PeVerify started requiring this assembly after I refactored some test helpers.
// I verified that the actual assemblies being compiled only differ by MVID before/after, so I don't think
// it's a product issue. I *think* that one of the CompileAndVerify calls above may have been writing the
// neutral assembly to disk somewhere that Fusion could find and load it (perhaps RefEmit wrote it to disk?).
dependencies
:
new
[]
{
new
ModuleData
(
neutral
.
Assembly
.
Identity
,
OutputKind
.
DynamicallyLinkedLibrary
,
neutral
.
EmitToArray
(
options
:
new
EmitOptions
(
metadataOnly
:
true
)),
pdb
:
default
(
ImmutableArray
<
byte
>),
inMemoryModule
:
true
)
},
sourceSymbolValidator
:
m
=>
{
Assert
.
Equal
(
1
,
m
.
GetReferencedAssemblySymbols
().
Length
);
...
...
@@ -354,7 +341,8 @@ void M(neutral x)
{
Assert
.
Equal
(
2
,
((
PEModuleSymbol
)
m
).
GetReferencedAssemblySymbols
().
Length
);
Assert
.
Equal
(
"neutral, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
,
m
.
GetReferencedAssemblySymbols
()[
1
].
ToTestDisplayString
());
}).
VerifyDiagnostics
();
},
verify
:
false
).
VerifyDiagnostics
();
compilation
=
CreateCompilationWithMscorlib
(
@"
...
...
@@ -375,7 +363,7 @@ void M(de x)
compilation
=
CreateCompilationWithMscorlib
(
""
,
new
MetadataReference
[]
{
compilation
.
EmitToImageReference
()
},
TestOptions
.
ReleaseDll
,
assemblyName
:
assemblyNameBase
+
"60"
);
CompileAndVerify
(
compilation
).
VerifyDiagnostics
(
CompileAndVerify
(
compilation
,
verify
:
false
).
VerifyDiagnostics
(
// warning CS8009: Referenced assembly 'de, Version=0.0.0.0, Culture=de, PublicKeyToken=null' has different culture setting of 'de'.
Diagnostic
(
ErrorCode
.
WRN_RefCultureMismatch
).
WithArguments
(
"de, Version=0.0.0.0, Culture=de, PublicKeyToken=null"
,
"de"
)
);
...
...
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncTests.cs
浏览文件 @
613a30c5
...
...
@@ -1920,7 +1920,7 @@ static void Main()
CompileAndVerify
(
source
,
"0"
);
}
[
Fact
(
Skip
=
"https://github.com/dotnet/roslyn/issues/4300"
)
]
[
Fact
]
public
void
Return07_2
()
{
var
source
=
@"
...
...
src/Test/Utilities/Desktop/HostedRuntimeEnvironment.cs
浏览文件 @
613a30c5
...
...
@@ -115,7 +115,7 @@ private RuntimeData CreateAndInitializeRuntimeData(IEnumerable<ModuleData> compi
allModules
=
allModules
.
ToArray
();
var
runtimeData
=
GetOrCreateRuntimeData
(
compilationDependenci
es
);
var
runtimeData
=
GetOrCreateRuntimeData
(
allModul
es
);
// Many prominent assemblys like mscorlib are already in the RuntimeAssemblyManager. Only
// add in the delta values to reduce serialization overhead going across AppDomains.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录