Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c6f5fe4d
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,发现更多精彩内容 >>
提交
c6f5fe4d
编写于
1月 30, 2017
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ability to move roslyn-internal forward too
上级
71e064f0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
6 deletion
+19
-6
src/Tools/GenerateSdkPackages/change-all.ps1
src/Tools/GenerateSdkPackages/change-all.ps1
+15
-2
src/Tools/RepoUtil/Program.cs
src/Tools/RepoUtil/Program.cs
+2
-2
src/Tools/RepoUtil/RepoData.cs
src/Tools/RepoUtil/RepoData.cs
+2
-2
未找到文件。
src/Tools/GenerateSdkPackages/change-all.ps1
浏览文件 @
c6f5fe4d
...
...
@@ -11,7 +11,8 @@ try {
exit
1
}
$repoUtil
=
join-path
$PSScriptRoot
"..\..\..\Binaries\Debug\Exes\RepoUtil\RepoUtil.exe"
$rootPath
=
resolve-path
(
join-path
$PSScriptRoot
"..\..\..\"
)
$repoUtil
=
join-path
$rootPath
"Binaries\Debug\Exes\RepoUtil\RepoUtil.exe"
if
(
-not
(
test-path
$repoUtil
))
{
write-host
"RepoUtil not found
$repoUtil
"
exit
1
...
...
@@ -32,7 +33,19 @@ try {
$changeFilePath
=
[
IO.Path
]::
GetTempFileName
()
$changeList
|
out-file
$changeFilePath
&
$repoUtil
change
-version
$changeFilePath
$fullSln
=
join-path
$rootPath
"..\Roslyn.sln"
if
(
test-path
$fullSln
)
{
# Running as a part of the full enlisment. Need to add some extra paramteers
$sourcesPath
=
resolve-path
(
join-path
$rootPath
".."
)
$generatePath
=
$rootPath
$configPath
=
join-path
$rootPath
"build\config\RepoUtilData.json"
&
$repoUtil
-sourcesPath
$sourcesPath
-generatePath
$generatePath
-config
$configPath
change
-version
$changeFilePath
}
else
{
# Just open so run there.
&
$repoUtil
change
-version
$changeFilePath
}
}
catch
[
exception
]
{
write-host
$_
.
Exception
...
...
src/Tools/RepoUtil/Program.cs
浏览文件 @
c6f5fe4d
...
...
@@ -194,10 +194,10 @@ private static bool TryParseCommand(string[] args, ref int index, out CreateComm
func
=
(
c
,
s
,
g
)
=>
new
ViewCommand
(
c
,
s
);
break
;
case
"consumes"
:
func
=
(
c
,
s
,
g
)
=>
new
ConsumesCommand
(
RepoData
.
Create
(
c
,
s
));
func
=
(
c
,
s
,
g
)
=>
new
ConsumesCommand
(
RepoData
.
Create
(
c
,
s
,
ignoreConflicts
:
false
));
break
;
case
"change"
:
func
=
(
c
,
s
,
g
)
=>
new
ChangeCommand
(
RepoData
.
Create
(
c
,
s
),
g
);
func
=
(
c
,
s
,
g
)
=>
new
ChangeCommand
(
RepoData
.
Create
(
c
,
s
,
ignoreConflicts
:
true
),
g
);
break
;
case
"produces"
:
func
=
(
c
,
s
,
g
)
=>
new
ProducesCommand
(
c
,
s
);
...
...
src/Tools/RepoUtil/RepoData.cs
浏览文件 @
c6f5fe4d
...
...
@@ -56,11 +56,11 @@ private static ImmutableArray<NuGetPackage> Combine(params ImmutableArray<NuGetP
/// state of the repo and add in the current data. If any conflicting package definitions are detected this method
/// will throw.
/// </summary>
internal
static
RepoData
Create
(
RepoConfig
config
,
string
sourcesDir
)
internal
static
RepoData
Create
(
RepoConfig
config
,
string
sourcesDir
,
bool
ignoreConflicts
)
{
List
<
NuGetPackageConflict
>
conflicts
;
var
repoData
=
Create
(
config
,
sourcesDir
,
out
conflicts
);
if
(
conflicts
?.
Count
>
0
)
if
(
conflicts
?.
Count
>
0
&&
!
ignoreConflicts
)
{
throw
new
ConflictingPackagesException
(
conflicts
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录