Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
81c1d25d
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,发现更多精彩内容 >>
提交
81c1d25d
编写于
7月 07, 2016
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Insert DSRN to its own ExternalAPI directory.
上级
060e3d7d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
14 deletion
+27
-14
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+19
-7
src/Setup/DevDivPackages/Dependencies.proj
src/Setup/DevDivPackages/Dependencies.proj
+8
-7
未找到文件。
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @
81c1d25d
...
...
@@ -357,11 +357,16 @@ Public Module 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
filesToInsert
.
Add
(
New
NugetFileInfo
(
fileName
))
AddXmlDocumentationFile
(
filesToInsert
,
fileName
)
Dim
dependency
As
DependencyInfo
=
Nothing
If
Not
dependencies
.
TryGetValue
(
fileName
,
dependency
)
Then
AddXmlDocumentationFile
(
filesToInsert
,
fileName
)
filesToInsert
.
Add
(
New
NugetFileInfo
(
fileName
))
End
If
If
NeedsLocalization
(
fileName
)
Then
GenerateLocProject
(
fileName
,
Path
.
Combine
(
ExternalApisDirName
,
"Roslyn"
,
fileName
),
locProjects
)
Dim
relativeOutputDir
=
GetExternalApiDirectory
(
dependency
)
GenerateLocProject
(
fileName
,
Path
.
Combine
(
relativeOutputDir
,
fileName
),
locProjects
)
End
If
Next
...
...
@@ -387,6 +392,12 @@ Public Module BuildDevDivInsertionFiles
GenerateTestFileDependencyList
(
NameOf
(
IntegrationTestFilesExtra
),
IntegrationTestFilesExtra
,
insertedFiles
)
End
Sub
Private
Shared
Function
GetExternalApiDirectory
(
Optional
dependency
As
DependencyInfo
=
Nothing
)
As
String
Return
If
(
dependency
Is
Nothing
,
Path
.
Combine
(
ExternalApisDirName
,
"Roslyn"
),
Path
.
Combine
(
ExternalApisDirName
,
dependency
.
PackageName
,
dependency
.
Target
))
End
Function
Private
Class
NugetFileInfo
Implements
IEquatable
(
Of
NugetFileInfo
)
...
...
@@ -448,7 +459,8 @@ Public Module BuildDevDivInsertionFiles
"netstandard1.2"
,
"netstandard1.3"
,
"netstandard1.4"
,
"netstandard1.5"
"netstandard1.5"
,
"native"
}
Private
Shared
Function
GetPlatformId
(
target
As
String
)
As
String
...
...
@@ -583,11 +595,11 @@ Public Module BuildDevDivInsertionFiles
Dim
relativeOutputDir
As
String
If
IsLanguageServiceRegistrationFile
(
fileName
)
Then
relativeOutputDir
=
Path
.
Combine
(
ExternalApisDirName
,
"Roslyn"
,
"LanguageServiceRegistration"
,
vsixName
)
relativeOutputDir
=
Path
.
Combine
(
GetExternalApiDirectory
()
,
"LanguageServiceRegistration"
,
vsixName
)
ElseIf
dependencies
.
TryGetValue
(
fileName
,
dependency
)
Then
relativeOutputDir
=
Path
.
Combine
(
ExternalApisDirName
,
dependency
.
PackageName
,
dependency
.
Target
)
relativeOutputDir
=
GetExternalApiDirectory
(
dependency
)
Else
relativeOutputDir
=
Path
.
Combine
(
ExternalApisDirName
,
"Roslyn"
)
relativeOutputDir
=
GetExternalApiDirectory
(
)
End
If
Dim
relativeOutputFilePath
=
Path
.
Combine
(
relativeOutputDir
,
fileName
)
...
...
src/Setup/DevDivPackages/Dependencies.proj
浏览文件 @
81c1d25d
...
...
@@ -9,13 +9,13 @@
<ItemGroup>
<!--
We create new CoreXT packages here for two reasons:
1) Package exists on NuGet but has a different structure than what DevDiv projects expect (External=true)
1) Package exists on NuGet but has a different structure than what DevDiv projects expect (External=true)
2) Package doesn't exist on NuGet, the content is built from Roslyn repo (External=false)
TODO:
The goal is to remove all these packages. We need to update DevDiv projects that reference the binaries
and/or move the source for the packages to separate repos.
-->
-->
<NuSpec
Include=
"Microsoft.VisualStudio.InteractiveWindow"
>
<Version>
$(MicrosoftVisualStudioInteractiveWindowVersion)-beta-$(BuildNumberPart1.Trim())-$(BuildNumberPart2.Trim())
</Version>
<External>
false
</External>
...
...
@@ -37,13 +37,14 @@
<External>
true
</External>
</NuSpec>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<!--
Packages that exist on NuGet and already have structure compatible with DevDiv.
-->
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader\$(MicrosoftDiaSymReaderVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.CodeAnalysis.Elfie\$(MicrosoftCodeAnalysisElfieVersion)\*.nupkg"
/>
-->
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader\$(MicrosoftDiaSymReaderVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader.PortablePdb\$(MicrosoftDiaSymReaderPortablePdbVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.CodeAnalysis.Elfie\$(MicrosoftCodeAnalysisElfieVersion)\*.nupkg"
/>
</ItemGroup>
<Target
Name=
"Build"
Inputs=
"@(NuSpec)"
Outputs=
"@(NuSpec->$(PackagesOutDir)\VS.ExternalAPIs.%(NuSpec.Identity).%(Version).nupkg"
>
<MakeDir
Directories=
"$(PackagesOutDir)"
Condition=
"!Exists('$(PackagesOutDir)')"
/>
...
...
@@ -55,7 +56,7 @@
<Exec
Command=
'Pack.cmd "VS.ExternalAPIs.%(NuSpec.Identity).nuspec" %(NuSpec.Version) "$(BaseDir)" "$(PackagesOutDir)"'
CustomErrorRegularExpression=
"pack: invalid arguments"
/>
</Target>
<Target
Name=
"CopyFiles"
Inputs=
"@(NuPkg)"
Outputs=
"@(NuPkg->$(PackagesOutDir)\%(Filename)%(Extension))"
AfterTargets=
"Build"
>
<Target
Name=
"CopyFiles"
Inputs=
"@(NuPkg)"
Outputs=
"@(NuPkg->$(PackagesOutDir)\%(Filename)%(Extension))"
AfterTargets=
"Build"
>
<Copy
SourceFiles=
"%(NuPkg.Fullpath)"
DestinationFolder=
"$(PackagesOutDir)"
/>
</Target>
<Target
Name=
"Clean"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录