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.

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

Merge branch "main" into dev #9296

Merged
merged 6 commits into from
Nov 3, 2022
Merged

Merge branch "main" into dev #9296

merged 6 commits into from
Nov 3, 2022

Conversation

joelverhagen
Copy link
Member

I had to use a custom branch for the merge since the last dev to main merge was a squash which results in Git thinking there are conflicts.

advay26 and others added 6 commits September 19, 2022 12:04
[ReleasePrep][2022.09.16]RI of dev into main
[ReleasePrep][2022.09.21]FI of dev into main for NuGetGallery
[ReleasePrep][2022.10.05] RI of dev into main
* Update NuGetGallery.Services to address CG alerts (#9274)

* Address accessibility for syntax highlighting (#9273)

* address accessbility for syntax highlighting

* Fix Support link (#9276)

* fix broken support link

* Update Download table heading (#9267)

* update correct place

* update table header placement

* Add instructions to install MSBuildSdk packages (#9268)

* Added "IsMSBuildSdkPackageType" to determine whether a package is of type MSBuildSdk.

DisplayPackage view modified to show specific instructions for SDK types in project files as per #8800

* Changed "Include" to correct attribute "Name" for SDK package type

Co-authored-by: Advay Tandon <82980589+advay26@users.noreply.github.com>
Co-authored-by: lyndaidaii <64443925+lyndaidaii@users.noreply.github.com>

* [CodeQL] Suppress CSRF token validation warnings (#9278)

* Added CSRF token checks to address CodeQL bugs

* Added CodeQL suppressions

* Make thinner border for focused links (#9277)

* Make thiner border for focused links

* Change border size of package manager tabs

* Delete comment line from base.less

* Change nav-tabs color and make overflow-y visible for package-tags

Co-authored-by: Joel Verhagen <jver@microsoft.com>
Co-authored-by: lyndaidaii <64443925+lyndaidaii@users.noreply.github.com>
Co-authored-by: toseni <seniut.tomas@gmail.com>
Co-authored-by: Ian Rathbone <ian@rathbone.dev>
Co-authored-by: Advay Tandon <82980589+advay26@users.noreply.github.com>
Co-authored-by: Daniel Olczyk <44818681+MRmlik12@users.noreply.github.com>
… packages (#9279)

The original implementation used a securityAdvisory(databaseId) query which no longer exists. This switches to using GHSA ID as the parameter.
@joelverhagen joelverhagen requested a review from a team as a code owner November 3, 2022 13:39
@joelverhagen joelverhagen merged commit 6ce4702 into dev Nov 3, 2022
@joelverhagen joelverhagen deleted the jver-merge branch November 3, 2022 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants