-
Notifications
You must be signed in to change notification settings - Fork 551
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.
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
fix: [OSM-1797] Fixing multi-project bug related to Improved .NET scans #5354
Merged
dotkas
merged 7 commits into
main
from
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
Jul 9, 2024
Merged
fix: [OSM-1797] Fixing multi-project bug related to Improved .NET scans #5354
dotkas
merged 7 commits into
main
from
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
Jul 9, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotkas
changed the title
fix: [OSM-1797] Fixing bug with improved .NET scanning failing on multiple projects in same folder
fix: [OSM-1797] Fixing multi-project bug related to Improved .NET scans
Jun 28, 2024
dotkas
force-pushed
the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
from
June 28, 2024 09:39
7c2bc17
to
fbdbb31
Compare
j-luong
approved these changes
Jun 28, 2024
dotkas
force-pushed
the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
3 times, most recently
from
July 2, 2024 08:48
54f97f2
to
032f888
Compare
Running `snyk test --dotnet-runtime-resolution` in folders that contained multiple `.csproj` files would fail as our logic was not directly referencing the project in question. The updated plugin version fixes this and this PR contains acceptance tests for proof.
dotkas
force-pushed
the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
from
July 8, 2024 08:28
032f888
to
83b5457
Compare
|
dotkas
force-pushed
the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
2 times, most recently
from
July 9, 2024 06:56
4783446
to
93bdecd
Compare
dotkas
force-pushed
the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
from
July 9, 2024 08:17
93bdecd
to
987150e
Compare
dotkas
deleted the
dotkas/OSM-1797/add-multi-project-support-for-improved-dotnet
branch
July 9, 2024 08:55
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Submission
Please check the boxes once done.
The pull request must:
feat:
orfix:
, others might be used in rare occasions as well, if there is no need to document the changes in the release notes. The changes or fixes should be described in detail in the commit message for the changelog & release notes.Pull Request Review
All pull requests must undergo a thorough review process before being merged.
The review process of the code PR should include code review, testing, and any necessary feedback or revisions.
Pull request reviews of functionality developed in other teams only review the given documentation and test reports.
Manual testing will not be performed by the reviewing team, and is the responsibility of the author of the PR.
For Node projects: It’s important to make sure changes in
package.json
are also affectingpackage-lock.json
correctly.If a dependency is not necessary, don’t add it.
When adding a new package as a dependency, make sure that the change is absolutely necessary. We would like to refrain from adding new dependencies when possible.
Documentation PRs in gitbook are reviewed by Snyk's content team. They will also advise on the best phrasing and structuring if needed.
Pull Request Approval
Once a pull request has been reviewed and all necessary revisions have been made, it is approved for merging into
the main codebase. The merging of the code PR is performed by the code owners, the merging of the documentation PR
by our content writers.
What does this PR do?
Fixes a bug related to multi-project .NET folder structures.
Where should the reviewer start?
snyk test
in a multi-project folder snyk-nuget-plugin#213 andHow should this be manually tested?
git clone git@github.com:snyk/dotnet-fixtures.git
cd project-files/csproj/multiple-csproj-in-same-folder
snyk test --dotnet-runtime-resolution
Test fails with a dotnet error related to multiple projects in the same folder.
Do the same with this update, now it works.
Risk assessment
Low, no breaking changes are introduced.
Any background context you want to provide?
This is a part of the Improved .NET Beta and the changes have already been merged to the SCM version of this logic.
What are the relevant tickets?
https://snyksec.atlassian.net/browse/OSM-1797
Screenshots
N/A
Additional questions
We should wait with merging this until #5309 and #5276 are merged. This will most likely cause some simple merge conflicts.