Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Fix project type GUIDs when adding projects to solution files. #8796

Merged
peterhuene merged 1 commit into from
Mar 23, 2018
Merged

Fix project type GUIDs when adding projects to solution files. #8796

peterhuene merged 1 commit into from
Mar 23, 2018

Conversation

@peterhuene
Copy link

@peterhuene peterhuene commented Mar 15, 2018 •
edited
Loading

This PR ensures the correct property (ProjectTypeGuids) is respected when
adding a project to a solution file.

Additionally, we now error if a project type GUID cannot be determined rather
than incorrectly mapping to the C# project type.

Enabled previously disabled tests that were waiting on upstream changes from
MSBuild and F#.

Fixes #5131.
Fixes #7742.

@peterhuene peterhuene requested a review from a team March 15, 2018 01:25
@nguerrera
Copy link
Contributor

nguerrera commented Mar 15, 2018

Cc @davkean Can you review this?

nguerrera
nguerrera reviewed Mar 15, 2018
View reviewed changes
src/dotnet/ProjectInstanceExtensions.cs Outdated
projectTypeGuid = projectTypeGuidProperty.Split(';').Last();
}
else
var projectTypeGuids = projectInstance.GetPropertyValue("ProjectTypeGuids");

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

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

This comment was marked as spam.

Sign in to view

@peterhuene
Copy link
Author

peterhuene commented Mar 19, 2018

ping @davkean 😄

@peterhuene peterhuene requested a review from davkean March 19, 2018 15:53
@peterhuene peterhuene changed the base branch from master to release/2.1.3xx March 20, 2018 17:15
@peterhuene
Copy link
Author

peterhuene commented Mar 21, 2018

ping @davkean for one last review :)

davkean
davkean reviewed Mar 22, 2018
View reviewed changes
src/dotnet/ProjectRootElementExtensions.cs Outdated
{
return rootElement
.Properties
.FirstOrDefault(p => p.Name == "ProjectTypeGuids")

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Fix project type GUIDs when adding projects to solution files.
e30fe29 
This commit ensures the correct property (`ProjectTypeGuids`) is respected when
adding a project to a solution file.

Additionally, we now error if a project type GUID cannot be determined rather
than incorrectly mapping to the C# project type.

Enabled previously disabled tests that were waiting on upstream changes from
MSBuild and F#.

Fixes #5131.
Fixes #7742.
@peterhuene
Copy link
Author

peterhuene commented Mar 23, 2018

@MattGertz for 2.1.3xx tell mode

@peterhuene peterhuene merged commit e61a7a3 into dotnet:release/2.1.3xx Mar 23, 2018
@peterhuene peterhuene deleted the project-type-guid branch March 23, 2018 05:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@nguerrera nguerrera nguerrera left review comments

@livarcocc livarcocc livarcocc approved these changes

@davkean davkean davkean approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@peterhuene @nguerrera @livarcocc @davkean