Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
09b08a5d
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,发现更多精彩内容 >>
提交
09b08a5d
编写于
5月 04, 2017
作者:
T
Tomáš Matoušek
提交者:
GitHub
5月 04, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19224 from tmat/FixToolsetPackage
Include DSRN in toolset package
上级
72d2b319
ec013580
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
10 deletion
+11
-10
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+11
-10
未找到文件。
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @
09b08a5d
...
...
@@ -406,7 +406,6 @@ Public Class BuildDevDivInsertionFiles
' And now copy over all our core compiler binaries and related files
' Build tools setup authoring depends on these files being inserted.
For
Each
fileName
In
CompilerFiles
Dim
dependency
As
DependencyInfo
=
Nothing
If
Not
dependencies
.
TryGetValue
(
fileName
,
dependency
)
Then
AddXmlDocumentationFile
(
filesToInsert
,
fileName
)
...
...
@@ -414,12 +413,14 @@ Public Class BuildDevDivInsertionFiles
End
If
Next
' Add just the compiler files to a separate compiler nuspec
' (with the Immutable collections and System.Reflection.Metadata, which
' are normally inserted separately)
Dim
allCompilerFiles
=
CompilerFiles
.
Concat
({
"System.Collections.Immutable.dll"
,
"System.Reflection.Metadata.dll"
})
GenerateRoslynCompilerNuSpec
(
allCompilerFiles
)
' VS.Tools.Roslyn CoreXT package needs to contain all dependencies.
Dim
vsToolsetFiles
=
CompilerFiles
.
Concat
({
"System.Collections.Immutable.dll"
,
"System.Reflection.Metadata.dll"
,
"Microsoft.DiaSymReader.Native.amd64.dll"
,
"Microsoft.DiaSymReader.Native.x86.dll"
})
GenerateVSToolsRoslynCoreXTNuspec
(
vsToolsetFiles
)
' Copy over the files in the NetFX20 subdirectory (identical, except for references and Authenticode signing).
' These are for msvsmon, whose setup authoring is done by the debugger.
...
...
@@ -558,7 +559,7 @@ Public Class BuildDevDivInsertionFiles
Dim
targetObj
=
DirectCast
(
DirectCast
(
DirectCast
(
items
,
JObject
).
Property
(
"targets"
)
?
.
Value
,
JObject
).
Property
(
targetFx
)
?
.
Value
,
JObject
)
If
targetObj
Is
Nothing
Then
Throw
New
InvalidDataException
(
$
"Expected platform
n
ot found in '{projectLockJson}': '{targetFx}'"
)
Throw
New
InvalidDataException
(
$
"Expected platform
N
ot found in '{projectLockJson}': '{targetFx}'"
)
End
If
For
Each
targetProperty
In
targetObj
.
Properties
...
...
@@ -724,7 +725,7 @@ Public Class BuildDevDivInsertionFiles
Private
Sub
ParseSwrFile
(
path
As
String
,
<
Out
>
ByRef
version
As
Version
,
<
Out
>
ByRef
files
As
IEnumerable
(
Of
String
))
Dim
lines
=
File
.
ReadAllLines
(
path
)
version
=
v
ersion
.
Parse
(
lines
.
Single
(
Function
(
line
)
line
.
TrimStart
().
StartsWith
(
"version="
)).
Split
(
"="
c
)(
1
))
version
=
V
ersion
.
Parse
(
lines
.
Single
(
Function
(
line
)
line
.
TrimStart
().
StartsWith
(
"version="
)).
Split
(
"="
c
)(
1
))
files
=
(
From
line
In
lines
Where
line
.
TrimStart
().
StartsWith
(
"file"
)).
ToArray
()
End
Sub
...
...
@@ -1039,7 +1040,7 @@ Public Class BuildDevDivInsertionFiles
End
Sub
Private
Sub
Generate
RoslynCompilerNuS
pec
(
filesToInsert
As
IEnumerable
(
Of
String
))
Private
Sub
Generate
VSToolsRoslynCoreXTNus
pec
(
filesToInsert
As
IEnumerable
(
Of
String
))
Const
PackageName
As
String
=
"VS.Tools.Roslyn"
' No duplicates are allowed
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录