Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d20a0376
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,发现更多精彩内容 >>
提交
d20a0376
编写于
10月 09, 2017
作者:
A
Ashley Hauck
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Factor DotnetHostInfo creation into a common method
上级
e4584e21
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
54 deletion
+31
-54
src/Compilers/Core/MSBuildTask/InteractiveCompiler.cs
src/Compilers/Core/MSBuildTask/InteractiveCompiler.cs
+2
-29
src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
+29
-25
未找到文件。
src/Compilers/Core/MSBuildTask/InteractiveCompiler.cs
浏览文件 @
d20a0376
...
...
@@ -191,21 +191,7 @@ private DotnetHost DotnetHostInfo
AddCommandLineCommands
(
commandLineBuilder
);
var
commandLine
=
commandLineBuilder
.
ToString
();
// ToolExe delegates back to ToolName if the override is not
// set. So, if ToolExe == ToolName, we know ToolExe is not
// explicitly overriden. So, if both ToolPath is unset and
// ToolExe == ToolName, we know nothing is overridden, and
// we can use our own csc.
if
(
string
.
IsNullOrEmpty
(
ToolPath
)
&&
ToolExe
==
ToolName
)
{
_dotnetHostInfo
=
DotnetHost
.
CreateManagedInvocationTool
(
ToolName
,
commandLine
);
}
else
{
// Explicitly provided ToolPath or ToolExe, don't try to
// figure anything out
_dotnetHostInfo
=
DotnetHost
.
CreateNativeInvocationTool
(
Path
.
Combine
(
ToolPath
??
""
,
ToolExe
),
commandLine
);
}
_dotnetHostInfo
=
ManagedCompiler
.
CreateDotnetHostInfo
(
ToolPath
,
ToolExe
,
ToolName
,
commandLine
);
}
return
_dotnetHostInfo
;
}
...
...
@@ -215,20 +201,7 @@ private DotnetHost DotnetHostInfo
protected
abstract
string
ToolNameWithoutExtension
{
get
;
}
protected
sealed
override
string
ToolName
{
get
{
if
(
CoreClrShim
.
IsRunningOnCoreClr
)
{
return
$"
{
ToolNameWithoutExtension
}
.dll"
;
}
else
{
return
$"
{
ToolNameWithoutExtension
}
.exe"
;
}
}
}
protected
sealed
override
string
ToolName
=>
ManagedCompiler
.
GenerateToolName
(
ToolNameWithoutExtension
);
protected
override
int
ExecuteTool
(
string
pathToTool
,
string
responseFileCommands
,
string
commandLineCommands
)
{
...
...
src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
浏览文件 @
d20a0376
...
...
@@ -409,6 +409,25 @@ public string LangVersion
#
endregion
internal
static
DotnetHost
CreateDotnetHostInfo
(
string
toolPath
,
string
toolExe
,
string
toolName
,
string
commandLine
)
{
// ToolExe delegates back to ToolName if the override is not
// set. So, if ToolExe == ToolName, we know ToolExe is not
// explicitly overriden. So, if both ToolPath is unset and
// ToolExe == ToolName, we know nothing is overridden, and
// we can use our own csc.
if
(
string
.
IsNullOrEmpty
(
toolPath
)
&&
toolExe
==
toolName
)
{
return
DotnetHost
.
CreateManagedInvocationTool
(
toolName
,
commandLine
);
}
else
{
// Explicitly provided ToolPath or ToolExe, don't try to
// figure anything out
return
DotnetHost
.
CreateNativeInvocationTool
(
Path
.
Combine
(
toolPath
??
""
,
toolExe
),
commandLine
);
}
}
private
DotnetHost
_dotnetHostInfo
;
private
DotnetHost
DotnetHostInfo
{
...
...
@@ -420,21 +439,7 @@ private DotnetHost DotnetHostInfo
AddCommandLineCommands
(
commandLineBuilder
);
var
commandLine
=
commandLineBuilder
.
ToString
();
// ToolExe delegates back to ToolName if the override is not
// set. So, if ToolExe == ToolName, we know ToolExe is not
// explicitly overriden. So, if both ToolPath is unset and
// ToolExe == ToolName, we know nothing is overridden, and
// we can use our own csc.
if
(
string
.
IsNullOrEmpty
(
ToolPath
)
&&
ToolExe
==
ToolName
)
{
_dotnetHostInfo
=
DotnetHost
.
CreateManagedInvocationTool
(
ToolName
,
commandLine
);
}
else
{
// Explicitly provided ToolPath or ToolExe, don't try to
// figure anything out
_dotnetHostInfo
=
DotnetHost
.
CreateNativeInvocationTool
(
Path
.
Combine
(
ToolPath
??
""
,
ToolExe
),
commandLine
);
}
_dotnetHostInfo
=
CreateDotnetHostInfo
(
ToolPath
,
ToolExe
,
ToolName
,
commandLine
);
}
return
_dotnetHostInfo
;
}
...
...
@@ -442,21 +447,20 @@ private DotnetHost DotnetHostInfo
protected
abstract
string
ToolNameWithoutExtension
{
get
;
}
protected
sealed
override
string
ToolName
internal
static
string
GenerateToolName
(
string
toolNameWithoutExtension
)
{
get
if
(
CoreClrShim
.
IsRunningOnCoreClr
)
{
if
(
CoreClrShim
.
IsRunningOnCoreClr
)
{
return
$"
{
ToolNameWithoutExtension
}
.dll"
;
}
else
{
return
$"
{
ToolNameWithoutExtension
}
.exe"
;
}
return
$"
{
toolNameWithoutExtension
}
.dll"
;
}
else
{
return
$"
{
toolNameWithoutExtension
}
.exe"
;
}
}
protected
sealed
override
string
ToolName
=>
GenerateToolName
(
ToolNameWithoutExtension
);
/// <summary>
/// Method for testing only
/// </summary>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录