Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
ea44dc5e
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,发现更多精彩内容 >>
提交
ea44dc5e
编写于
10月 11, 2016
作者:
A
Andy Gocke
提交者:
GitHub
10月 11, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add blanket exception handling in DesktopStrongNameProvider (#14414)
上级
387d373d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
83 addition
and
3 deletion
+83
-3
src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
...CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
+80
-0
src/Compilers/Core/Portable/StrongName/DesktopStrongNameProvider.cs
...ers/Core/Portable/StrongName/DesktopStrongNameProvider.cs
+3
-3
未找到文件。
src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
浏览文件 @
ea44dc5e
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
Microsoft.CodeAnalysis.CSharp.Test.Utilities
;
using
Roslyn.Test.Utilities
;
using
System
;
using
System.Collections.Immutable
;
using
System.IO
;
using
Xunit
;
...
...
@@ -41,6 +43,84 @@ internal override Stream CreateInputStream()
_underlyingProvider
.
SignAssembly
(
keys
,
inputStream
,
outputStream
);
}
private
class
TestDesktopStrongNameProvider
:
DesktopStrongNameProvider
{
private
readonly
Func
<
string
,
byte
[
]>
m_readAllBytes
;
internal
delegate
void
ReadKeysFromContainerDelegate
(
string
keyContainer
,
out
ImmutableArray
<
byte
>
publicKey
);
private
readonly
ReadKeysFromContainerDelegate
m_readKeysFromContainer
;
public
TestDesktopStrongNameProvider
(
Func
<
string
,
byte
[
]>
readAllBytes
=
null
,
ReadKeysFromContainerDelegate
readKeysFromContainer
=
null
)
{
m_readAllBytes
=
readAllBytes
;
m_readKeysFromContainer
=
readKeysFromContainer
;
}
internal
override
byte
[]
ReadAllBytes
(
string
fullPath
)
=>
m_readAllBytes
!=
null
?
m_readAllBytes
(
fullPath
)
:
base
.
ReadAllBytes
(
fullPath
);
internal
override
void
ReadKeysFromContainer
(
string
keyContainer
,
out
ImmutableArray
<
byte
>
publicKey
)
{
if
(
m_readKeysFromContainer
!=
null
)
{
m_readKeysFromContainer
(
keyContainer
,
out
publicKey
);
}
else
{
base
.
ReadKeysFromContainer
(
keyContainer
,
out
publicKey
);
}
}
}
[
Fact
]
[
WorkItem
(
209695
,
"https://devdiv.visualstudio.com/DevDiv/_workitems?id=209694"
)]
public
void
ExceptionInReadAllBytes
()
{
var
ex
=
new
Exception
(
"Crazy exception you could never have predicted!"
);
var
provider
=
new
TestDesktopStrongNameProvider
((
_
)
=>
{
throw
ex
;
});
var
src
=
@"class C {}"
;
var
keyFile
=
Temp
.
CreateFile
().
WriteAllBytes
(
TestResources
.
General
.
snKey
).
Path
;
var
options
=
TestOptions
.
DebugDll
.
WithStrongNameProvider
(
provider
)
.
WithCryptoKeyFile
(
keyFile
);
var
comp
=
CreateCompilationWithMscorlib
(
src
,
options
:
options
);
comp
.
VerifyEmitDiagnostics
(
// error CS7027: Error signing output with public key from file '{0}' -- '{1}'
Diagnostic
(
ErrorCode
.
ERR_PublicKeyFileFailure
).
WithArguments
(
keyFile
,
ex
.
Message
).
WithLocation
(
1
,
1
));
}
[
Fact
]
public
void
ExceptionInReadKeysFromContainer
()
{
var
ex
=
new
Exception
(
"Crazy exception you could never have predicted!"
);
var
provider
=
new
TestDesktopStrongNameProvider
(
readKeysFromContainer
:
(
string
_1
,
out
ImmutableArray
<
byte
>
_2
)
=>
{
throw
ex
;
});
var
src
=
@"class C {}"
;
var
options
=
TestOptions
.
DebugDll
.
WithStrongNameProvider
(
provider
)
.
WithCryptoKeyContainer
(
"RoslynTestContainer"
);
var
comp
=
CreateCompilationWithMscorlib
(
src
,
options
:
options
);
comp
.
VerifyEmitDiagnostics
(
// error CS7028: Error signing output with public key from container 'RoslynTestContainer' -- Crazy exception you could never have predicted!
Diagnostic
(
ErrorCode
.
ERR_PublicKeyContainerFailure
).
WithArguments
(
"RoslynTestContainer"
,
ex
.
Message
).
WithLocation
(
1
,
1
));
}
[
Fact
]
public
void
BadInputStream
()
{
...
...
src/Compilers/Core/Portable/StrongName/DesktopStrongNameProvider.cs
浏览文件 @
ea44dc5e
...
...
@@ -213,7 +213,7 @@ internal override StrongNameKeys CreateKeys(string keyFilePath, string keyContai
var
fileContent
=
ImmutableArray
.
Create
(
ReadAllBytes
(
resolvedKeyFile
));
return
StrongNameKeys
.
CreateHelper
(
fileContent
,
keyFilePath
);
}
catch
(
IO
Exception
ex
)
catch
(
Exception
ex
)
{
return
new
StrongNameKeys
(
StrongNameKeys
.
GetKeyFileError
(
messageProvider
,
keyFilePath
,
ex
.
Message
));
}
...
...
@@ -232,7 +232,7 @@ internal override StrongNameKeys CreateKeys(string keyFilePath, string keyContai
return
new
StrongNameKeys
(
StrongNameKeys
.
GetContainerError
(
messageProvider
,
keyContainerName
,
new
CodeAnalysisResourcesLocalizableErrorArgument
(
nameof
(
CodeAnalysisResources
.
AssemblySigningNotSupported
))));
}
catch
(
IO
Exception
ex
)
catch
(
Exception
ex
)
{
return
new
StrongNameKeys
(
StrongNameKeys
.
GetContainerError
(
messageProvider
,
keyContainerName
,
ex
.
Message
));
}
...
...
@@ -241,7 +241,7 @@ internal override StrongNameKeys CreateKeys(string keyFilePath, string keyContai
return
new
StrongNameKeys
(
keyPair
,
publicKey
,
container
,
keyFilePath
);
}
private
void
ReadKeysFromContainer
(
string
keyContainer
,
out
ImmutableArray
<
byte
>
publicKey
)
internal
virtual
void
ReadKeysFromContainer
(
string
keyContainer
,
out
ImmutableArray
<
byte
>
publicKey
)
{
try
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录