Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
f2f28940
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,发现更多精彩内容 >>
提交
f2f28940
编写于
10月 17, 2018
作者:
D
Dustin Campbell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename ProjectBuildManager methods and fields involved in batch building for clarity
上级
f23243fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
26 deletion
+28
-26
src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
...kspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
+24
-22
src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker.cs
...paces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker.cs
+2
-2
src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs
src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs
+2
-2
未找到文件。
src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
浏览文件 @
f2f28940
...
...
@@ -44,13 +44,13 @@ internal class ProjectBuildManager
private
readonly
ImmutableDictionary
<
string
,
string
>
_additionalGlobalProperties
;
private
MSB
.
Evaluation
.
ProjectCollection
_
p
rojectCollection
;
private
MSBuildDiagnosticLogger
_
l
ogger
;
private
bool
_
s
tarted
;
private
MSB
.
Evaluation
.
ProjectCollection
_
batchBuildP
rojectCollection
;
private
MSBuildDiagnosticLogger
_
batchBuildL
ogger
;
private
bool
_
batchBuildS
tarted
;
~
ProjectBuildManager
()
{
if
(
_
s
tarted
)
if
(
_
batchBuildS
tarted
)
{
new
InvalidOperationException
(
"ProjectBuilderManager.Stop() not called."
);
}
...
...
@@ -104,9 +104,9 @@ public ProjectBuildManager(ImmutableDictionary<string, string> additionalGlobalP
public
Task
<(
MSB
.
Evaluation
.
Project
project
,
DiagnosticLog
log
)>
LoadProjectAsync
(
string
path
,
CancellationToken
cancellationToken
)
{
if
(
_
s
tarted
)
if
(
_
batchBuildS
tarted
)
{
return
LoadProjectAsync
(
path
,
_
p
rojectCollection
,
cancellationToken
);
return
LoadProjectAsync
(
path
,
_
batchBuildP
rojectCollection
,
cancellationToken
);
}
else
{
...
...
@@ -126,7 +126,7 @@ public ProjectBuildManager(ImmutableDictionary<string, string> additionalGlobalP
public
async
Task
<
string
>
TryGetOutputFilePathAsync
(
string
path
,
CancellationToken
cancellationToken
)
{
Debug
.
Assert
(
_
s
tarted
);
Debug
.
Assert
(
_
batchBuildS
tarted
);
// This tries to get the project output path and retrieving the evaluated $(TargetPath) property.
...
...
@@ -134,35 +134,37 @@ public ProjectBuildManager(ImmutableDictionary<string, string> additionalGlobalP
return
project
?.
GetPropertyValue
(
PropertyNames
.
TargetPath
);
}
public
void
Start
(
IDictionary
<
string
,
string
>
globalProperties
=
null
)
public
bool
BatchBuildStarted
=>
_batchBuildStarted
;
public
void
StartBatchBuild
(
IDictionary
<
string
,
string
>
globalProperties
=
null
)
{
if
(
_
s
tarted
)
if
(
_
batchBuildS
tarted
)
{
throw
new
InvalidOperationException
();
}
globalProperties
=
globalProperties
??
ImmutableDictionary
<
string
,
string
>.
Empty
;
var
allProperties
=
s_defaultGlobalProperties
.
AddRange
(
globalProperties
);
_
p
rojectCollection
=
new
MSB
.
Evaluation
.
ProjectCollection
(
allProperties
);
_
batchBuildP
rojectCollection
=
new
MSB
.
Evaluation
.
ProjectCollection
(
allProperties
);
_
l
ogger
=
new
MSBuildDiagnosticLogger
()
_
batchBuildL
ogger
=
new
MSBuildDiagnosticLogger
()
{
Verbosity
=
MSB
.
Framework
.
LoggerVerbosity
.
Normal
};
var
buildParameters
=
new
MSB
.
Execution
.
BuildParameters
(
_
p
rojectCollection
)
var
buildParameters
=
new
MSB
.
Execution
.
BuildParameters
(
_
batchBuildP
rojectCollection
)
{
Loggers
=
new
MSB
.
Framework
.
ILogger
[]
{
_
l
ogger
}
Loggers
=
new
MSB
.
Framework
.
ILogger
[]
{
_
batchBuildL
ogger
}
};
MSB
.
Execution
.
BuildManager
.
DefaultBuildManager
.
BeginBuild
(
buildParameters
);
_
s
tarted
=
true
;
_
batchBuildS
tarted
=
true
;
}
public
void
Stop
()
public
void
EndBatchBuild
()
{
if
(!
_
s
tarted
)
if
(!
_
batchBuildS
tarted
)
{
throw
new
InvalidOperationException
();
}
...
...
@@ -170,16 +172,16 @@ public void Stop()
MSB
.
Execution
.
BuildManager
.
DefaultBuildManager
.
EndBuild
();
// unload project so collection will release global strings
_
p
rojectCollection
.
UnloadAllProjects
();
_
p
rojectCollection
=
null
;
_
l
ogger
=
null
;
_
s
tarted
=
false
;
_
batchBuildP
rojectCollection
.
UnloadAllProjects
();
_
batchBuildP
rojectCollection
=
null
;
_
batchBuildL
ogger
=
null
;
_
batchBuildS
tarted
=
false
;
}
public
Task
<
MSB
.
Execution
.
ProjectInstance
>
BuildProjectAsync
(
MSB
.
Evaluation
.
Project
project
,
DiagnosticLog
log
,
CancellationToken
cancellationToken
)
{
Debug
.
Assert
(
_
s
tarted
);
Debug
.
Assert
(
_
batchBuildS
tarted
);
var
targets
=
new
[]
{
TargetNames
.
Compile
,
TargetNames
.
CoreCompile
};
...
...
@@ -203,7 +205,7 @@ public void Stop()
}
}
_
l
ogger
.
SetProjectAndLog
(
projectInstance
.
FullPath
,
log
);
_
batchBuildL
ogger
.
SetProjectAndLog
(
projectInstance
.
FullPath
,
log
);
var
buildRequestData
=
new
MSB
.
Execution
.
BuildRequestData
(
projectInstance
,
targets
);
...
...
src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker.cs
浏览文件 @
f2f28940
...
...
@@ -130,7 +130,7 @@ public async Task<ImmutableArray<ProjectInfo>> LoadAsync(CancellationToken cance
var
results
=
ImmutableArray
.
CreateBuilder
<
ProjectInfo
>();
var
processedPaths
=
new
HashSet
<
string
>(
PathUtilities
.
Comparer
);
_buildManager
.
Start
(
_globalProperties
);
_buildManager
.
Start
BatchBuild
(
_globalProperties
);
try
{
foreach
(
var
projectPath
in
_requestedProjectPaths
)
...
...
@@ -171,7 +171,7 @@ public async Task<ImmutableArray<ProjectInfo>> LoadAsync(CancellationToken cance
}
finally
{
_buildManager
.
Stop
();
_buildManager
.
EndBatchBuild
();
}
}
...
...
src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs
浏览文件 @
f2f28940
...
...
@@ -3518,11 +3518,11 @@ public async Task TestOpenProject_CommandLineArgsHaveNoErrors()
var
projectFilePath
=
GetSolutionFileName
(
@"CSharpProject\CSharpProject.csproj"
);
var
buildManager
=
new
ProjectBuildManager
(
ImmutableDictionary
<
string
,
string
>.
Empty
);
buildManager
.
Start
();
buildManager
.
Start
BatchBuild
();
var
projectFile
=
await
loader
.
LoadProjectFileAsync
(
projectFilePath
,
buildManager
,
CancellationToken
.
None
);
var
projectFileInfo
=
(
await
projectFile
.
GetProjectFileInfosAsync
(
CancellationToken
.
None
)).
Single
();
buildManager
.
Stop
();
buildManager
.
EndBatchBuild
();
var
commandLineParser
=
workspace
.
Services
.
GetLanguageServices
(
loader
.
Language
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录