Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
a614fcb6
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,发现更多精彩内容 >>
提交
a614fcb6
编写于
6月 17, 2015
作者:
T
Tanner Gooding
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3545 from tannergooding/mef-fixup
Update Roslyn to work with the MEF Composition API changes.
上级
654ebb1c
67b23fd9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
4 deletion
+4
-4
src/EditorFeatures/Test/MinimalTestExportProvider.cs
src/EditorFeatures/Test/MinimalTestExportProvider.cs
+4
-4
未找到文件。
src/EditorFeatures/Test/MinimalTestExportProvider.cs
浏览文件 @
a614fcb6
...
...
@@ -19,7 +19,7 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests
{
public
static
class
MinimalTestExportProvider
{
private
static
readonly
PartDiscovery
s_partDiscovery
=
PartDiscovery
.
Combine
(
new
AttributedPartDiscoveryV1
(
),
new
AttributedPartDiscovery
()
{
IsNonPublicSupported
=
true
}
);
private
static
readonly
PartDiscovery
s_partDiscovery
=
PartDiscovery
.
Combine
(
new
AttributedPartDiscoveryV1
(
Resolver
.
DefaultInstance
),
new
AttributedPartDiscovery
(
Resolver
.
DefaultInstance
,
isNonPublicSupported
:
true
)
);
private
static
readonly
Lazy
<
ComposableCatalog
>
s_lazyLanguageNeutralCatalog
=
new
Lazy
<
ComposableCatalog
>(()
=>
CreateAssemblyCatalog
(
GetVisualStudioAssemblies
()).
WithParts
(
CreateAssemblyCatalog
(
GetLanguageNeutralTypes
().
Select
(
t
=>
t
.
Assembly
).
Distinct
())));
public
static
ComposableCatalog
LanguageNeutralCatalog
...
...
@@ -108,7 +108,7 @@ public static ComposableCatalog CreateAssemblyCatalog(IEnumerable<Assembly> asse
// on the thread.
var
parts
=
Task
.
Run
(
async
()
=>
await
s_partDiscovery
.
CreatePartsAsync
(
assemblies
).
ConfigureAwait
(
false
)).
Result
;
return
ComposableCatalog
.
Create
(
parts
);
return
ComposableCatalog
.
Create
(
Resolver
.
DefaultInstance
).
AddParts
(
parts
);
}
public
static
ComposableCatalog
CreateTypeCatalog
(
IEnumerable
<
Type
>
types
)
...
...
@@ -117,12 +117,12 @@ public static ComposableCatalog CreateTypeCatalog(IEnumerable<Type> types)
// on the thread.
var
parts
=
Task
.
Run
(
async
()
=>
await
s_partDiscovery
.
CreatePartsAsync
(
types
).
ConfigureAwait
(
false
)).
Result
;
return
ComposableCatalog
.
Create
(
parts
);
return
ComposableCatalog
.
Create
(
Resolver
.
DefaultInstance
).
AddParts
(
parts
);
}
public
static
ComposableCatalog
WithParts
(
this
ComposableCatalog
@this
,
ComposableCatalog
catalog
)
{
return
@this
.
With
Parts
(
catalog
.
DiscoveredParts
);
return
@this
.
Add
Parts
(
catalog
.
DiscoveredParts
);
}
public
static
ComposableCatalog
WithParts
(
this
ComposableCatalog
catalog
,
IEnumerable
<
Type
>
types
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录