Migrate P2P references #4221

Sridhar-MS · 2016-09-22T01:04:16Z

Fixes item 2 and 5 in https://github.com/dotnet/cli/issues/4167

Given a project migrate all the project references recursively.
Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
Add tests

src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs

+                    var projectFile = ((ProjectDescription)export.Library).Project.ProjectFilePath;
+                    var projectDir = Path.GetDirectoryName(projectFile);
+
+                    if (_migratedProjects.Contains(projectDir))


src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs

+            Queue<MigrationSettings> settingsQueue = new Queue<MigrationSettings>();
+            settingsQueue.Enqueue(settings);
+
+            while(settingsQueue.Count() != 0)


src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs

 {
    public class ProjectDependencyFinder 
    {
+        public IEnumerable<ProjectDependency> ResolveProjectDependencies(IEnumerable<ProjectContext> projectContexts)


src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs

+
+            if (IsMigrated(migrationSettings, migrationRuleInputs))
+            {
+                // TODO : Adding user-visible logging


src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs

+                throw new ArgumentNullException();
+            }
+
+            MigrateHelper(rootSettings);


brthor · 2016-09-23T18:42:00Z

A couple small comments, overall looks great.

After those are addressed

src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs

+            var projectRootDirectory = GetRootFromProjectJson(projectJsonFilePath);

            var projectSearchPaths = new List<string>();
-            projectSearchPaths.Add(projectDirectory);


- Given a project migrate all the project references recursively. - Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated. - Remove the '--output' since it is not used heavily and makes migrating multiple projects easier. - Add tests

Sridhar-MS · 2016-09-23T23:07:51Z

@dotnet-bot test CentOS7.1 x64 Debug Build please

brthor · 2016-09-23T23:21:39Z

After the xproj test Looks good

Sridhar-MS · 2016-09-24T00:49:58Z

@dotnet-bot test OpenSUSE13.2 x64 Debug Build please

livarcocc · 2016-09-24T02:14:43Z

@dotnet-bot Test OpenSUSE13.2 x64 Debug Build

dnfclas added the cla-already-signed label Sep 22, 2016

brthor reviewed Sep 22, 2016

View reviewed changes

Sridhar-MS force-pushed the sridhar-ms/multiple-proj-migrate branch from ff10c48 to 37063c4 Compare September 23, 2016 07:32

Sridhar-MS changed the title ~~[WIP-Do not merge]Migrate P2P references~~ Migrate P2P references Sep 23, 2016

brthor reviewed Sep 23, 2016

View reviewed changes

src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs

if (IsMigrated(migrationSettings, migrationRuleInputs))

{

// TODO : Adding user-visible logging

This comment was marked as spam.

Sign in to view

brthor reviewed Sep 23, 2016

View reviewed changes

src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs Outdated

throw new ArgumentNullException();

}

MigrateHelper(rootSettings);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Sridhar-MS commented Sep 23, 2016

View reviewed changes

Sridhar-MS and others added 2 commits September 23, 2016 14:25

fix projectdependnecy finder

b0565e6

Sridhar-MS force-pushed the sridhar-ms/multiple-proj-migrate branch 2 times, most recently from 4a7ed87 to 8075d73 Compare September 23, 2016 21:53

Address PR Feedback

d43ade9

Sridhar-MS force-pushed the sridhar-ms/multiple-proj-migrate branch from 8075d73 to d43ade9 Compare September 23, 2016 22:31

Add xproj tests to test migrate command.

ec7aa87

Sridhar-MS force-pushed the sridhar-ms/multiple-proj-migrate branch from 5c0ecbb to ec7aa87 Compare September 24, 2016 00:33

Sridhar-MS merged commit 038fb6f into rel/1.0.0 Sep 24, 2016

Sridhar-MS deleted the sridhar-ms/multiple-proj-migrate branch September 24, 2016 05:31

brthor mentioned this pull request Jan 31, 2020

Migration: Migrate sets of projects dotnet/sdk#6829

Closed

5 tasks

Migrate P2P references #4221

Migrate P2P references #4221

Uh oh!

Conversation

Sridhar-MS commented Sep 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

brthor commented Sep 23, 2016

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Sridhar-MS commented Sep 23, 2016

Uh oh!

brthor commented Sep 23, 2016

Uh oh!

Sridhar-MS commented Sep 24, 2016

Uh oh!

livarcocc commented Sep 24, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Sridhar-MS commented Sep 22, 2016 •

edited

Loading