Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
f86e6a1d
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,发现更多精彩内容 >>
提交
f86e6a1d
编写于
4月 07, 2017
作者:
K
Kevin Pilch
提交者:
GitHub
4月 07, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18360 from Pilchie/dpl-cleanup-netcore
Don't create deferred projects for things that opt-out of DPL
上级
271f59e2
15d86236
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
27 deletion
+20
-27
src/VisualStudio/Core/Def/Implementation/ProjectSystem/Interop/IVsSolution7.cs
.../Def/Implementation/ProjectSystem/Interop/IVsSolution7.cs
+0
-15
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs
...mplementation/ProjectSystem/VisualStudioProjectTracker.cs
+8
-4
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl_IVsSolutionEvents.cs
...jectSystem/VisualStudioWorkspaceImpl_IVsSolutionEvents.cs
+10
-5
src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
+0
-1
src/VisualStudio/Core/Def/project.json
src/VisualStudio/Core/Def/project.json
+2
-1
src/VisualStudio/Core/Next/project.json
src/VisualStudio/Core/Next/project.json
+0
-1
未找到文件。
src/VisualStudio/Core/Def/Implementation/ProjectSystem/Interop/IVsSolution7.cs
已删除
100644 → 0
浏览文件 @
271f59e2
using
System
;
using
System.Runtime.InteropServices
;
namespace
Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.Interop
{
[
ComImport
]
[
Guid
(
"D32B0C42-8AEE-4772-B5C3-04565CDA5A47"
)]
[
InterfaceType
(
ComInterfaceType
.
InterfaceIsIUnknown
)]
internal
interface
IVsSolution7
{
void
OpenFolder
([
MarshalAs
(
UnmanagedType
.
LPWStr
)]
string
folderPath
);
void
CloseFolder
([
MarshalAs
(
UnmanagedType
.
LPWStr
)]
string
folderPath
);
bool
IsSolutionLoadDeferred
();
}
}
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs
浏览文件 @
f86e6a1d
...
...
@@ -539,9 +539,7 @@ public void OnAfterCloseSolution()
if
(
_deferredLoadWasEnabledForLastSolution
)
{
// Copy to avoid modifying the collection while enumerating
var
loadedProjects
=
ImmutableProjects
.
ToList
();
foreach
(
var
p
in
loadedProjects
)
foreach
(
var
p
in
ImmutableProjects
)
{
p
.
Disconnect
();
}
...
...
@@ -690,6 +688,12 @@ private void OutputToOutputWindow(string message)
return
null
;
}
var
solution7
=
(
IVsSolution7
)
_vsSolution
;
if
(!
solution7
.
IsDeferredProjectLoadAllowed
(
projectFilename
))
{
return
null
;
}
var
commandLineParser
=
_workspaceServices
.
GetLanguageServices
(
languageName
).
GetService
<
ICommandLineParserService
>();
var
projectDirectory
=
PathUtilities
.
GetDirectoryName
(
projectFilename
);
var
commandLineArguments
=
commandLineParser
.
Parse
(
...
...
@@ -698,7 +702,7 @@ private void OutputToOutputWindow(string message)
isInteractive
:
false
,
sdkDirectory
:
RuntimeEnvironment
.
GetRuntimeDirectory
());
// TODO: Should come from sln file?
// TODO: Should come from
.
sln file?
var
projectName
=
PathUtilities
.
GetFileName
(
projectFilename
,
includeExtension
:
false
);
// `AbstractProject` only sets the filename if it actually exists. Since we want
...
...
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl_IVsSolutionEvents.cs
浏览文件 @
f86e6a1d
...
...
@@ -90,13 +90,18 @@ int IVsSolutionEvents.OnAfterCloseSolution(object pUnkReserved)
return
VSConstants
.
S_OK
;
}
/// <summary>
/// Returns whether the solution overall has Lightweight solution load enabled, either
/// through the global option in Tools\Options, or the .suo specific option.
///
/// NOTE: Does *NOT* mean that all projects in the solution are deferred. Project types
/// can opt out. Use <see cref="IVsSolution7.IsDeferredProjectLoadAllowed(string)"/> to
/// see if a specific project can be deferred.
/// </summary>
internal
static
bool
IsDeferredSolutionLoadEnabled
(
IServiceProvider
serviceProvider
)
{
// NOTE: It is expected that the "as" will fail on Dev14, as IVsSolution7 was
// introduced in Dev15. Be sure to handle the null result here.
var
solution7
=
serviceProvider
.
GetService
(
typeof
(
SVsSolution
))
as
IVsSolution7
;
return
solution7
?.
IsSolutionLoadDeferred
()
==
true
;
var
solution7
=
(
IVsSolution7
)
serviceProvider
.
GetService
(
typeof
(
SVsSolution
));
return
solution7
.
IsSolutionLoadDeferred
();
}
}
}
src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
浏览文件 @
f86e6a1d
...
...
@@ -96,7 +96,6 @@
<Compile
Include=
"Implementation\Preview\ReferenceChange.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\CPS\ICodeModelFactory.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\IDeferredProjectWorkspaceService.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\Interop\IVsSolution7.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\Legacy\AbstractLegacyProject_ICompilerOptionsHostObject.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\Legacy\AbstractLegacyProject_IIntellisenseBuildTarget.cs"
/>
<Compile
Include=
"Implementation\ProjectSystem\CPS\IWorkspaceProjectContextFactory.cs"
/>
...
...
src/VisualStudio/Core/Def/project.json
浏览文件 @
f86e6a1d
...
...
@@ -11,8 +11,9 @@
"Microsoft.VisualStudio.Shell.Interop.10.0"
:
"10.0.30319"
,
"Microsoft.VisualStudio.Shell.Interop.11.0"
:
"11.0.61030"
,
"Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime"
:
"12.1.30328"
,
"Microsoft.VisualStudio.Shell.15.0"
:
"15.0.26201-alpha"
,
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime"
:
"14.3.25407"
,
"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime"
:
"15.0.26201-alpha"
,
"Microsoft.VisualStudio.Shell.15.0"
:
"15.0.26201-alpha"
,
"Microsoft.VisualStudio.Shell.Framework"
:
"15.0.26201-alpha"
,
"Microsoft.VisualStudio.Shell.Immutable.10.0"
:
"15.0.26201-alpha"
,
"Microsoft.VisualStudio.Editor"
:
"15.0.26201-alpha"
,
...
...
src/VisualStudio/Core/Next/project.json
浏览文件 @
f86e6a1d
...
...
@@ -18,7 +18,6 @@
"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime"
:
"14.3.25407"
,
"Microsoft.ServiceHub.Client"
:
"1.0.177-rc-g56d40a8a02"
,
"Newtonsoft.Json"
:
"8.0.3"
,
"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime"
:
"15.0.26201-alpha"
,
"RoslynDependencies.Microsoft.VisualStudio.Workspace"
:
"14.0.983-pre-ge167e81694"
,
"System.Collections.Immutable"
:
"1.3.1"
,
"Microsoft.Tpl.Dataflow"
:
"4.5.24"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录