Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring ErrorList into NuGet.VisualStudio.Common #2340

Merged
merged 5 commits into from
Jul 17, 2018
Merged

Refactoring ErrorList into NuGet.VisualStudio.Common #2340

merged 5 commits into from
Jul 17, 2018

Conversation

mishra14
Copy link
Contributor

Follow up to #2313

As requested by @nkolev92, I have refactored the code to move ErrorListTableEntry.cs and ErrorListTableDataSource.cs from NuGet.SolutionRestoreManager to NuGet.VisualStudio.Common and removed the dependency from NuGet.Tools to NuGet.SolutionRestoreManager

Also updating the guid for test projects based off of this comment.

nkolev92
nkolev92 approved these changes Jul 12, 2018
View reviewed changes
Copy link
Member

@nkolev92 nkolev92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

A few minor questions.

NuGet.sln
@@ -222,12 +222,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Shared.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.MSSigning.Extensions.FuncTest", "test\NuGet.Clients.FuncTests\NuGet.MSSigning.Extensions.FuncTest\NuGet.MSSigning.Extensions.FuncTest.csproj", "{BA7F681E-FDC7-42B6-8BF1-74DA6421BA1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.MSSigning.Extensions.Test", "test\NuGet.Clients.Tests\NuGet.MSSigning.Extensions.Test\NuGet.MSSigning.Extensions.Test.csproj", "{2A604A43-C72A-4A03-B68B-66AF4B6F430E}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the project Guid changing here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also updating the guid for test projects based off of this comment.

src/NuGet.Clients/NuGet.Tools/NuGet.Tools.csproj
@@ -106,10 +106,6 @@
<Project>{538adefd-2170-40a9-a2c5-ec8369cfe490}</Project>
<Name>NuGet.PackageManagement.UI</Name>
</ProjectReference>
<ProjectReference Include="..\NuGet.SolutionRestoreManager\NuGet.SolutionRestoreManager.csproj">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

test/NuGet.Clients.Tests/NuGet.VisualStudio.Common.Test/NuGet.VisualStudio.Common.Test.csproj Outdated
</PropertyGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need these?

jainaashish
jainaashish reviewed Jul 12, 2018
View reviewed changes
src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vs14.vsixmanifest
@@ -23,6 +23,7 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.Console" Path="|NuGet.Console|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.Implementation" Path="|NuGet.VisualStudio.Implementation|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.SolutionRestoreManager" Path="|NuGet.SolutionRestoreManager|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.Common" Path="|NuGet.VisualStudio.Common|" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why add here? Should we continue to manage dev14?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

larger question. Unless we decide to remove this, I think this is okay.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove everything dev 14 related from the codebase.

NuGet/Home#7112

jainaashish
jainaashish reviewed Jul 12, 2018
View reviewed changes
src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vs15.insertable.vsixmanifest
@@ -23,6 +23,7 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.Console" Path="|NuGet.Console|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.Implementation" Path="|NuGet.VisualStudio.Implementation|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.SolutionRestoreManager" Path="|NuGet.SolutionRestoreManager|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.Common" Path="|NuGet.VisualStudio.Common|" />
Copy link
Contributor

@jainaashish jainaashish Jul 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh we had to add it to MEFComponent list. But will it have any adverse effect on VS initialization or load for an additional MEF? As I've mentioned multiple times, this change doesn't make any difference on ground level since NuGet.SolutionRestoreManager is always the first NuGet package being loaded inside VS.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know. I will run RPS before checking this in.

Copy link
Contributor Author

@mishra14 mishra14 Jul 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RPS result for this branch is here. I see no new regression when compared to the last dev run.

jainaashish
jainaashish reviewed Jul 12, 2018
View reviewed changes
src/NuGet.Clients/NuGet.VisualStudio.Implementation/Extensibility/VsPathContextProvider.cs
@@ -260,18 +261,18 @@ private IVsPathContext2 GetSolutionPathContext(string packagesFolderPath)
if (string.IsNullOrEmpty(projectNameFromMSBuildPath))
{
projectJsonPath = Path.Combine(msbuildProjectFile.DirectoryName,
Common.ProjectJsonPathUtilities.ProjectConfigFileName);
ProjectJsonPathUtilities.ProjectConfigFileName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this file is being changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

namespace changes caused compiler errors between NuGet.Common and NuGet.VisualStudio.Common.

@mishra14 mishra14 closed this Jul 16, 2018
@nkolev92
Copy link
Member

@mishra14 Did this cause RPS problems?

@mishra14
Copy link
Contributor Author

mishra14 commented Jul 16, 2018 •
edited
Loading

@nkolev92 not sure yet. I was just rebasing from dev and github decided to close this 😆

i will reopen it.

@mishra14 mishra14 reopened this Jul 16, 2018
@mishra14
Copy link
Contributor Author

@jainaashish 🔔
RPS result for this branch is here. I see no new regression when compared to the last dev run.

@mishra14 mishra14 merged commit 4277fad into dev Jul 17, 2018
@mishra14 mishra14 deleted the dev-anmishr-refactor branch July 17, 2018 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkolev92 nkolev92 nkolev92 approved these changes

@jainaashish jainaashish jainaashish approved these changes

@rohit21agrawal rohit21agrawal Awaiting requested review from rohit21agrawal

@PatoBeltran PatoBeltran Awaiting requested review from PatoBeltran

@zhili1208 zhili1208 Awaiting requested review from zhili1208

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mishra14 @nkolev92 @jainaashish