Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
cec98c43
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,发现更多精彩内容 >>
提交
cec98c43
编写于
5月 03, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update tests.
上级
5450c803
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
21 deletion
+20
-21
src/EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
...EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
+7
-7
src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb
...alBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb
+7
-7
src/Features/Core/Portable/AddImport/SymbolReferenceFinder_PackageAssemblySearch.cs
.../AddImport/SymbolReferenceFinder_PackageAssemblySearch.cs
+1
-1
src/Features/Core/Portable/AddPackage/AbstractAddPackageCodeFixProvider.cs
.../Portable/AddPackage/AbstractAddPackageCodeFixProvider.cs
+1
-1
src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
...udio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
+3
-3
src/Workspaces/Core/Portable/Packaging/IPackageInstallerService.cs
...paces/Core/Portable/Packaging/IPackageInstallerService.cs
+1
-2
未找到文件。
src/EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
浏览文件 @
cec98c43
...
...
@@ -54,7 +54,7 @@ public async Task TestSearchPackageSingleName()
// Make a loose mock for the installer service. We don't care what this test
// calls on it.
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
TryInstallPackage
(
It
.
IsAny
<
Workspace
>(),
It
.
IsAny
<
DocumentId
>(),
It
.
IsAny
<
string
>(),
"NuGetPackage"
,
It
.
IsAny
<
string
>(),
It
.
IsAny
<
bool
>(),
It
.
IsAny
<
CancellationToken
>()))
.
Returns
(
true
);
...
...
@@ -83,7 +83,7 @@ public async Task TestSearchPackageMultipleNames()
// Make a loose mock for the installer service. We don't care what this test
// calls on it.
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
TryInstallPackage
(
It
.
IsAny
<
Workspace
>(),
It
.
IsAny
<
DocumentId
>(),
It
.
IsAny
<
string
>(),
"NuGetPackage"
,
It
.
IsAny
<
string
>(),
It
.
IsAny
<
bool
>(),
It
.
IsAny
<
CancellationToken
>()))
.
Returns
(
true
);
...
...
@@ -112,7 +112,7 @@ public async Task TestMissingIfPackageAlreadyInstalled()
// Make a loose mock for the installer service. We don't care what this test
// calls on it.
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
IsInstalled
(
It
.
IsAny
<
Workspace
>(),
It
.
IsAny
<
ProjectId
>(),
"NuGetPackage"
))
.
Returns
(
true
);
...
...
@@ -135,7 +135,7 @@ public async Task TestOptionsOffered()
// Make a loose mock for the installer service. We don't care what this test
// calls on it.
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
GetInstalledVersions
(
"NuGetPackage"
))
.
Returns
(
ImmutableArray
.
Create
(
"1.0"
,
"2.0"
));
...
...
@@ -177,7 +177,7 @@ public async Task TestOptionsOffered()
public
async
Task
TestInstallGetsCalledNoVersion
()
{
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
TryInstallPackage
(
It
.
IsAny
<
Workspace
>(),
It
.
IsAny
<
DocumentId
>(),
It
.
IsAny
<
string
>(),
"NuGetPackage"
,
/*versionOpt*/
null
,
It
.
IsAny
<
bool
>(),
It
.
IsAny
<
CancellationToken
>()))
.
Returns
(
true
);
...
...
@@ -205,7 +205,7 @@ class C
public
async
Task
TestInstallGetsCalledWithVersion
()
{
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
GetInstalledVersions
(
"NuGetPackage"
))
.
Returns
(
ImmutableArray
.
Create
(
"1.0"
));
...
...
@@ -235,7 +235,7 @@ class C
public
async
Task
TestFailedInstallRollsBackFile
()
{
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Loose
);
installerServiceMock
.
Setup
Get
(
i
=>
i
.
IsEnabled
).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())
).
Returns
(
true
);
installerServiceMock
.
SetupGet
(
i
=>
i
.
PackageSources
).
Returns
(
NugetPackageSources
);
installerServiceMock
.
Setup
(
s
=>
s
.
GetInstalledVersions
(
"NuGetPackage"
))
.
Returns
(
ImmutableArray
.
Create
(
"1.0"
));
...
...
src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb
浏览文件 @
cec98c43
...
...
@@ -44,7 +44,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp
' Make a loose mock for the installer service. We don't care what this test
' calls on it.
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
TryInstallPackage
(
It
.
IsAny
(
Of
Workspace
),
It
.
IsAny
(
Of
DocumentId
),
It
.
IsAny
(
Of
String
),
"NuGetPackage"
,
It
.
IsAny
(
Of
String
),
It
.
IsAny
(
Of
Boolean
),
It
.
IsAny
(
Of
CancellationToken
))).
Returns
(
True
)
...
...
@@ -71,7 +71,7 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa
' Make a loose mock for the installer service. We don't care what this test
' calls on it.
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
TryInstallPackage
(
It
.
IsAny
(
Of
Workspace
),
It
.
IsAny
(
Of
DocumentId
),
It
.
IsAny
(
Of
String
),
"NuGetPackage"
,
It
.
IsAny
(
Of
String
),
It
.
IsAny
(
Of
Boolean
),
It
.
IsAny
(
Of
CancellationToken
))).
Returns
(
True
)
...
...
@@ -98,7 +98,7 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa
' Make a loose mock for the installer service. We don't care what this test
' calls on it.
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
TryInstallPackage
(
It
.
IsAny
(
Of
Workspace
),
It
.
IsAny
(
Of
DocumentId
),
It
.
IsAny
(
Of
String
),
"NuGetPackage"
,
It
.
IsAny
(
Of
String
),
It
.
IsAny
(
Of
Boolean
),
It
.
IsAny
(
Of
CancellationToken
))).
Returns
(
False
)
...
...
@@ -123,7 +123,7 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa
' Make a loose mock for the installer service. We don't care what this test
' calls on it.
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
IsInstalled
(
It
.
IsAny
(
Of
Workspace
)(),
It
.
IsAny
(
Of
ProjectId
)(),
"NuGetPackage"
)).
Returns
(
True
)
...
...
@@ -145,7 +145,7 @@ New TestParameters(fixProviderData:=New ProviderData(installerServiceMock.Object
' Make a loose mock for the installer service. We don't care what this test
' calls on it.
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
GetInstalledVersions
(
"NuGetPackage"
)).
Returns
(
ImmutableArray
.
Create
(
"1.0"
,
"2.0"
))
...
...
@@ -185,7 +185,7 @@ parameters:=New TestParameters(fixProviderData:=data))
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
Public
Async
Function
TestInstallGetsCalledNoVersion
()
As
Task
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
TryInstallPackage
(
It
.
IsAny
(
Of
Workspace
),
It
.
IsAny
(
Of
DocumentId
),
It
.
IsAny
(
Of
String
),
"NuGetPackage"
,
Nothing
,
It
.
IsAny
(
Of
Boolean
),
It
.
IsAny
(
Of
CancellationToken
))).
Returns
(
True
)
...
...
@@ -211,7 +211,7 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
Public
Async
Function
TestInstallGetsCalledWithVersion
()
As
Task
Dim
installerServiceMock
=
New
Mock
(
Of
IPackageInstallerService
)(
MockBehavior
.
Loose
)
installerServiceMock
.
Setup
Get
(
Function
(
i
)
i
.
IsEnabled
).
Returns
(
True
)
installerServiceMock
.
Setup
(
Function
(
i
)
i
.
IsEnabled
(
It
.
IsAny
(
Of
ProjectId
))
).
Returns
(
True
)
installerServiceMock
.
SetupGet
(
Function
(
i
)
i
.
PackageSources
).
Returns
(
NugetPackageSources
)
installerServiceMock
.
Setup
(
Function
(
s
)
s
.
GetInstalledVersions
(
"NuGetPackage"
)).
Returns
(
ImmutableArray
.
Create
(
"1.0"
))
...
...
src/Features/Core/Portable/AddImport/SymbolReferenceFinder_PackageAssemblySearch.cs
浏览文件 @
cec98c43
...
...
@@ -84,7 +84,7 @@ private partial class SymbolReferenceFinder
if
(
symbolSearchService
!=
null
&&
installerService
!=
null
&&
searchNugetPackages
&&
installerService
.
IsEnabled
ForProject
(
_document
.
Project
.
Id
))
installerService
.
IsEnabled
(
_document
.
Project
.
Id
))
{
foreach
(
var
packageSource
in
installerService
.
PackageSources
)
{
...
...
src/Features/Core/Portable/AddPackage/AbstractAddPackageCodeFixProvider.cs
浏览文件 @
cec98c43
...
...
@@ -51,7 +51,7 @@ internal abstract partial class AbstractAddPackageCodeFixProvider : CodeFixProvi
if
(
symbolSearchService
!=
null
&&
installerService
!=
null
&&
searchNugetPackages
&&
installerService
.
IsEnabled
ForProject
(
document
.
Project
.
Id
))
installerService
.
IsEnabled
(
document
.
Project
.
Id
))
{
foreach
(
var
packageSource
in
installerService
.
PackageSources
)
{
...
...
src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs
浏览文件 @
cec98c43
...
...
@@ -77,11 +77,11 @@ internal partial class PackageInstallerService : AbstractDelayStartedService, IP
public
event
EventHandler
PackageSourcesChanged
;
p
ublic
bool
IsEnabled
=>
_packageServices
!=
null
;
p
rivate
bool
IsEnabled
=>
_packageServices
!=
null
;
public
bool
IsEnabledForProject
(
ProjectId
projectId
)
bool
IPackageInstallerService
.
IsEnabled
(
ProjectId
projectId
)
{
if
(
!
IsEnabled
)
if
(
_packageServices
==
null
)
{
return
false
;
}
...
...
src/Workspaces/Core/Portable/Packaging/IPackageInstallerService.cs
浏览文件 @
cec98c43
...
...
@@ -11,8 +11,7 @@ namespace Microsoft.CodeAnalysis.Packaging
{
internal
interface
IPackageInstallerService
:
IWorkspaceService
{
bool
IsEnabled
{
get
;
}
bool
IsEnabledForProject
(
ProjectId
projectId
);
bool
IsEnabled
(
ProjectId
projectId
);
bool
IsInstalled
(
Workspace
workspace
,
ProjectId
projectId
,
string
packageName
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录