提交 c6f5fe4d 编写于 作者: J Jared Parsons

Ability to move roslyn-internal forward too

上级 71e064f0
......@@ -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
......
......@@ -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);
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册