error preference
This commit is contained in:
parent
a078e8b845
commit
21c45de0b7
1 changed files with 19 additions and 8 deletions
|
@ -16,13 +16,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
{
|
{
|
||||||
public class ProjectMigrator
|
public class ProjectMigrator
|
||||||
{
|
{
|
||||||
// TODO: Migrate PackOptions
|
|
||||||
// TODO: Migrate Multi-TFM projects
|
|
||||||
// TODO: Tests
|
|
||||||
// TODO: Out of Scope
|
|
||||||
// - Globs that resolve to directories: /some/path/**/somedir
|
|
||||||
// - Migrating Deprecated project.jsons
|
|
||||||
|
|
||||||
private readonly IMigrationRule _ruleSet;
|
private readonly IMigrationRule _ruleSet;
|
||||||
private readonly ProjectDependencyFinder _projectDependencyFinder = new ProjectDependencyFinder();
|
private readonly ProjectDependencyFinder _projectDependencyFinder = new ProjectDependencyFinder();
|
||||||
|
|
||||||
|
@ -39,8 +32,26 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
{
|
{
|
||||||
throw new ArgumentNullException();
|
throw new ArgumentNullException();
|
||||||
}
|
}
|
||||||
|
Exception exc = null;
|
||||||
|
IEnumerable<ProjectDependency> projectDependencies = null;
|
||||||
|
|
||||||
var projectDependencies = ResolveTransitiveClosureProjectDependencies(rootSettings.ProjectDirectory, rootSettings.ProjectXProjFilePath);
|
try
|
||||||
|
{
|
||||||
|
projectDependencies = ResolveTransitiveClosureProjectDependencies(
|
||||||
|
rootSettings.ProjectDirectory,
|
||||||
|
rootSettings.ProjectXProjFilePath);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
exc = e;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify up front so we can prefer these errors over an unresolved project dependency
|
||||||
|
VerifyInputs(ComputeMigrationRuleInputs(rootSettings), rootSettings);
|
||||||
|
if (exc != null)
|
||||||
|
{
|
||||||
|
throw exc;
|
||||||
|
}
|
||||||
|
|
||||||
MigrateProject(rootSettings);
|
MigrateProject(rootSettings);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue