Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
83cc6a84
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,发现更多精彩内容 >>
提交
83cc6a84
编写于
8月 03, 2016
作者:
J
Jason Malinowski
提交者:
GitHub
8月 03, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12911 from jasonmalinowski/categorize-dependencies
Split our NuGet dependencies into subfolders
上级
5142d3a5
6f575a1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
11 deletion
+23
-11
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+1
-1
src/Setup/DevDivPackages/Dependencies.proj
src/Setup/DevDivPackages/Dependencies.proj
+22
-10
未找到文件。
src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
浏览文件 @
83cc6a84
...
...
@@ -474,7 +474,7 @@ Public Module BuildDevDivInsertionFiles
Private
Function
BuildDependencyMap
(
inputDirectory
As
String
)
As
Dictionary
(
Of
String
,
DependencyInfo
)
Dim
result
=
New
Dictionary
(
Of
String
,
DependencyInfo
)
For
Each
nupkgPath
In
Directory
.
EnumerateFiles
(
Path
.
Combine
(
inputDirectory
,
"DevDivPackages"
,
"Dependencies"
),
"*.nupkg"
,
SearchOption
.
TopDirectoryOnly
)
For
Each
nupkgPath
In
Directory
.
EnumerateFiles
(
Path
.
Combine
(
inputDirectory
,
"DevDivPackages"
,
"
Managed
Dependencies"
),
"*.nupkg"
,
SearchOption
.
TopDirectoryOnly
)
Using
zip
=
ZipFile
.
OpenRead
(
nupkgPath
)
Dim
packageName
As
String
=
Nothing
Dim
packageVersion
As
String
=
Nothing
...
...
src/Setup/DevDivPackages/Dependencies.proj
浏览文件 @
83cc6a84
...
...
@@ -4,7 +4,7 @@
<Import
Project=
"..\..\..\build\Targets\VSL.Settings.targets"
/>
</ImportGroup>
<PropertyGroup>
<PackagesOutDir>
$(OutDir)DevDivPackages
\Dependencies
</PackagesOutDir>
<PackagesOutDir>
$(OutDir)DevDivPackages
</PackagesOutDir>
</PropertyGroup>
<ItemGroup>
<!--
...
...
@@ -19,14 +19,17 @@
<NuSpec
Include=
"Microsoft.VisualStudio.InteractiveWindow"
>
<Version>
$(MicrosoftVisualStudioInteractiveWindowVersion)-beta-$(BuildNumberFiveDigitDateStamp)-$(BuildNumberBuildOfTheDayPadded)
</Version>
<External>
false
</External>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuSpec>
<NuSpec
Include=
"System.Collections.Immutable"
>
<Version>
$(SystemCollectionsImmutableVersion)
</Version>
<External>
true
</External>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuSpec>
<NuSpec
Include=
"System.Reflection.Metadata"
>
<Version>
$(SystemReflectionMetadataVersion)
</Version>
<External>
true
</External>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuSpec>
<NuSpec
Include=
"ManagedEsent"
>
<!--
...
...
@@ -35,29 +38,38 @@
-->
<Version>
$(ManagedEsentVersion)
</Version>
<External>
true
</External>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuSpec>
</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.DiaSymReader.PortablePdb\$(MicrosoftDiaSymReaderPortablePdbVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.CodeAnalysis.Elfie\$(MicrosoftCodeAnalysisElfieVersion)\*.nupkg"
/>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader\$(MicrosoftDiaSymReaderVersion)\*.nupkg"
>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuPkg>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader.PortablePdb\$(MicrosoftDiaSymReaderPortablePdbVersion)\*.nupkg"
>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuPkg>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.DiaSymReader.Native\$(MicrosoftDiaSymReaderNativeVersion)\*.nupkg"
>
<SubDirectory>
NativeDependencies
</SubDirectory>
</NuPkg>
<NuPkg
Include=
"$(NuGetPackageRoot)\Microsoft.CodeAnalysis.Elfie\$(MicrosoftCodeAnalysisElfieVersion)\*.nupkg"
>
<SubDirectory>
ManagedDependencies
</SubDirectory>
</NuPkg>
</ItemGroup>
<Target
Name=
"Build"
Inputs=
"@(NuSpec)"
Outputs=
"@(NuSpec->$(PackagesOutDir)\VS.ExternalAPIs.%(NuSpec.Identity).%(Version).nupkg"
>
<MakeDir
Directories=
"$(PackagesOutDir)
"
Condition=
"!Exists('$(PackagesOutDir)'
)"
/>
<Target
Name=
"Build"
Inputs=
"@(NuSpec)"
Outputs=
"@(NuSpec->$(PackagesOutDir)\
%(NuSpec.SubDirectory)\
VS.ExternalAPIs.%(NuSpec.Identity).%(Version).nupkg"
>
<MakeDir
Directories=
"$(PackagesOutDir)
\%(NuSpec.SubDirectory
)"
/>
<PropertyGroup>
<BaseDir
Condition=
"'%(NuSpec.External)'=='true'"
>
$(NuGetPackageRoot)\%(NuSpec.Identity)\%(NuSpec.Version)
</BaseDir>
<BaseDir
Condition=
"'%(NuSpec.External)'!='true'"
>
$(OutDir)\
</BaseDir>
</PropertyGroup>
<!-- nuget doesn't set exitcode when the value of an arg is invalid -->
<Exec
Command=
'Pack.cmd "VS.ExternalAPIs.%(NuSpec.Identity).nuspec" %(NuSpec.Version) "$(BaseDir)" "$(PackagesOutDir)"'
<Exec
Command=
'Pack.cmd "VS.ExternalAPIs.%(NuSpec.Identity).nuspec" %(NuSpec.Version) "$(BaseDir)" "$(PackagesOutDir)
\%(NuSpec.SubDirectory)
"'
CustomErrorRegularExpression=
"pack: invalid arguments"
/>
</Target>
<Target
Name=
"CopyFiles"
Inputs=
"@(NuPkg)"
Outputs=
"@(NuPkg->$(PackagesOutDir)\%(Filename)%(Extension))"
AfterTargets=
"Build"
>
<Copy
SourceFiles=
"%(NuPkg.Fullpath)"
DestinationFolder=
"$(PackagesOutDir)"
/>
<Target
Name=
"CopyFiles"
Inputs=
"@(NuPkg)"
Outputs=
"@(NuPkg->$(PackagesOutDir)\%(
NuPkg.SubDirectory)\%(
Filename)%(Extension))"
AfterTargets=
"Build"
>
<Copy
SourceFiles=
"%(NuPkg.Fullpath)"
DestinationFolder=
"$(PackagesOutDir)
\%(NuPkg.SubDirectory)
"
/>
</Target>
<Target
Name=
"Clean"
>
<RemoveDir
Directories=
"$(PackagesOutDir)"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录