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

Update solution files #92209

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Update solution files #92209

merged 2 commits into from
Sep 19, 2023

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Sep 18, 2023 •
edited
Loading

Fixes #92126

Solution files in dotnet/runtime aren't buildable anymore because dependencies are missing from the graph now that a live linker is consumed. This regressed with faf883d

Updates the infrastructure to allow subfolder paths and update all solution files.

@ViktorHofer ViktorHofer self-assigned this Sep 18, 2023
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Sep 18, 2023
@ViktorHofer ViktorHofer added area-Infrastructure-libraries and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Sep 18, 2023
@ghost
Copy link

ghost commented Sep 18, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Updates the infrastructure to allow subfolder paths and update all solution files.

Author: ViktorHofer
Assignees: ViktorHofer
Labels:

area-Infrastructure-libraries
Milestone: -

@ViktorHofer ViktorHofer changed the title Updated solution files Update solution files Sep 18, 2023
@build-analysis build-analysis bot mentioned this pull request Sep 18, 2023
Closed
sbomer
sbomer reviewed Sep 18, 2023
View reviewed changes
src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
@@ -49,6 +59,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5725D7DF-DC3
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{55D04C80-4A8F-40AC-967D-3FA77C814D7B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9C13782D-F7D7-4F02-A39D-D7BD992EB257}"
Copy link
Member

Choose a reason for hiding this comment

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

Do you know why "gen", "src", and "ref" are listed twice in the sln with different paths?

Copy link
Member Author

Choose a reason for hiding this comment

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

Once for the tools\...\ folder and once for the ref, src and gen folders for the libraries from src/libraries that aren't grouped under the tools folder.

Copy link
Member

@sbomer sbomer Sep 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks! I still don't understand why we have a gen folder. From decoding the sln GUIDs it seems like this is for ILLink.CodeFix/ILLink.RoslynAnalyzer, so probably because of

runtime/src/tools/illink/src/ILLink.CodeFix/Directory.Build.props

Lines 2 to 5 in e1ca02f

<!-- This analyzer doesn't follow the convention for generator projects so we set the property manually. -->
<PropertyGroup>
<IsGeneratorProject>true</IsGeneratorProject>
</PropertyGroup>
and similar for ILLink.RoslynAnalyzer. Why are we treating these as generator projects?

Copy link
Member

Choose a reason for hiding this comment

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

I think I see - IsGeneratorProject is just a catch-all term for analyzers and source generators, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

correct

src/tools/Directory.Build.props
<SlnGenSolutionFolder>tools</SlnGenSolutionFolder>
</PropertyGroup>

</Project>
Copy link
Member

Choose a reason for hiding this comment

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

nit: add newline at EOF

src/tools/Directory.Build.props Show resolved Hide resolved
@build-analysis build-analysis bot mentioned this pull request Sep 18, 2023
Closed
sbomer
sbomer approved these changes Sep 18, 2023
View reviewed changes
Copy link
Member

@sbomer sbomer left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@ViktorHofer ViktorHofer merged commit 963954a into main Sep 19, 2023
176 of 186 checks passed
@ViktorHofer ViktorHofer deleted the updateSlns branch September 19, 2023 05:34
@ghost ghost locked as resolved and limited conversation to collaborators Oct 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sbomer sbomer sbomer approved these changes

@marek-safar marek-safar Awaiting requested review from marek-safar marek-safar is a code owner

@lewing lewing Awaiting requested review from lewing lewing is a code owner

@pavelsavara pavelsavara Awaiting requested review from pavelsavara pavelsavara is a code owner

Assignees

@ViktorHofer ViktorHofer

Labels
area-Infrastructure-libraries
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ViktorHofer @sbomer