Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
84256cfa
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,发现更多精彩内容 >>
提交
84256cfa
编写于
5月 13, 2015
作者:
M
Matt Warren
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2687 from mattwar/Bug694
Do not throw if paths are bad
上级
59807baf
2973056b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
21 deletion
+15
-21
src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/ConvertedVisualBasicProjectOptions.vb
...l/ProjectSystemShim/ConvertedVisualBasicProjectOptions.vb
+15
-21
未找到文件。
src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/ConvertedVisualBasicProjectOptions.vb
浏览文件 @
84256cfa
...
...
@@ -55,7 +55,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
Public
Sub
New
(
options
As
VBCompilerOptions
,
compilerHost
As
IVbCompilerHost
,
globalImports
As
IEnumerable
(
Of
GlobalImport
),
strongNameKeyPaths
As
ImmutableArray
(
Of
String
),
projectDirectoryOpt
As
String
,
ruleSetOpt
As
IRuleSetFile
)
If
options
.
wszOutputPath
IsNot
Nothing
AndAlso
options
.
wszExeName
IsNot
Nothing
Then
OutputPath
=
Path
.
Combine
(
options
.
wszOutputPath
,
options
.
wszExeName
)
OutputPath
=
Path
Utilities
.
CombinePathsUnchecked
(
options
.
wszOutputPath
,
options
.
wszExeName
)
Else
OutputPath
=
String
.
Empty
End
If
...
...
@@ -80,36 +80,30 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
Dim
runtimes
=
New
List
(
Of
String
)
Select
Case
options
.
vbRuntimeKind
Case
VBRuntimeKind
.
DefaultRuntime
runtimes
.
Add
(
Path
.
Combine
(
compilerHost
.
GetSdkPath
(),
"Microsoft.VisualBasic.dll"
))
runtimes
.
Add
(
Path
Utilities
.
CombinePathsUnchecked
(
compilerHost
.
GetSdkPath
(),
"Microsoft.VisualBasic.dll"
))
Case
VBRuntimeKind
.
SpecifiedRuntime
If
options
.
wszSpecifiedVBRuntime
Is
Nothing
Then
Throw
New
ArgumentException
()
End
If
' If they specified a fully qualified file, use it
If
File
.
Exists
(
options
.
wszSpecifiedVBRuntime
)
Then
runtimes
.
Add
(
options
.
wszSpecifiedVBRuntime
)
Else
' If it's just a filename, try to find it in the SDK path.
If
options
.
wszSpecifiedVBRuntime
<>
Path
.
GetFileName
(
options
.
wszSpecifiedVBRuntime
)
Then
Throw
New
ArgumentException
()
End
If
Dim
runtimePath
=
Path
.
Combine
(
compilerHost
.
GetSdkPath
(),
options
.
wszSpecifiedVBRuntime
)
If
File
.
Exists
(
runtimePath
)
Then
runtimes
.
Add
(
runtimePath
)
If
options
.
wszSpecifiedVBRuntime
IsNot
Nothing
Then
' If they specified a fully qualified file, use it
If
File
.
Exists
(
options
.
wszSpecifiedVBRuntime
)
Then
runtimes
.
Add
(
options
.
wszSpecifiedVBRuntime
)
Else
Throw
New
ArgumentException
()
' If it's just a filename, try to find it in the SDK path.
If
options
.
wszSpecifiedVBRuntime
=
PathUtilities
.
GetFileName
(
options
.
wszSpecifiedVBRuntime
)
Then
Dim
runtimePath
=
PathUtilities
.
CombinePathsUnchecked
(
compilerHost
.
GetSdkPath
(),
options
.
wszSpecifiedVBRuntime
)
If
File
.
Exists
(
runtimePath
)
Then
runtimes
.
Add
(
runtimePath
)
End
If
End
If
End
If
End
If
End
Select
If
Not
options
.
bNoStandardLibs
Then
runtimes
.
Add
(
Path
.
Combine
(
compilerHost
.
GetSdkPath
(),
"System.dll"
))
runtimes
.
Add
(
Path
Utilities
.
CombinePathsUnchecked
(
compilerHost
.
GetSdkPath
(),
"System.dll"
))
End
If
runtimes
.
Add
(
Path
.
Combine
(
compilerHost
.
GetSdkPath
(),
"mscorlib.dll"
))
runtimes
.
Add
(
Path
Utilities
.
CombinePathsUnchecked
(
compilerHost
.
GetSdkPath
(),
"mscorlib.dll"
))
RuntimeLibraries
=
runtimes
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录