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 dev into main (NuGet.Jobs and ServerCommon merge) #10135

Merged
merged 3,967 commits into from
Aug 16, 2024
Merged

Conversation

joelverhagen
Copy link
Member

@joelverhagen joelverhagen commented Aug 16, 2024

This brings the NuGet.Jobs and ServerCommon source trees into main branch. They have already been merged into dev branch as of #10091 and #10109.

That's a lot of content to review, so let's focus on the changes NOT including NuGet.Jobs and ServerCommon. I have listed them here with diff links to illustrate how I found them:

In other words, these are the changes made to NuGetGallery or post-merge NuGet.Jobs and ServerCommon states.

DEV environment has latest dev branch deployment so you should be able to verify your changes there right now if you are worries:
https://dev.nugettest.org/

The rollout plan is to deploy the following jobs and services:

  • NuGetGallery (web app)
  • MonitoringProcessor
    • @joelverhagen is to verify his changes in INT then PROD.
    • Purpose: auth for Azure Search cursors
  • Catalog2Monitoring
    • @joelverhagen is to verify his changes in INT then PROD.
    • Purpose: auth for Azure Search cursors

agr and others added 30 commits June 2, 2023 12:18
* Updating NuGet dependencies

* Missing property added.
[ReleasePrep][2023-07-18]RI dev to main
* Package source mapping.
#411)

* Function for adding new package source mappings to nuget.config files.

* Defaulting to `$PWD` for relative paths

* Array of patterns, so we save once.
Package source mapping section presence check.
Transition from Microsoft.Azure.KeyVault to Azure.Security.KeyVault
joelverhagen and others added 21 commits August 2, 2024 21:11
Add -SkipArtifacts for further parallelism
This is for consistent with other projects
Merge ServerCommon repository into NuGetGallery
* Sanitize URLs for logging
* Fix container URI construction when directory is provided
* Remove flaky assertion
* Add auth to V3 monitoring search cursor URLs
* Use -clientId for managed identity auth on search cursors
* Allow UseManagedIdentity to be set per search instance
…when checking if blobs are synchronized (#10123)

* Handle blob name generate when base URI scheme does not match

This was causing monitoring2monitoring to fail with an invalid blob name (double slashes).
Scrub blob URL for logging

* Do not consider a blob as synchronize if the size is difference
* Add UTs
…ln (#10130)

Run simple validations on the .csproj:
- Test projects should only be in one solution (all solutions are tests in CI, reduce duplication)
- Determine whether a dependency package project common vs. gallery vs. jobs dynamically
- Verify AssemblyInfo.g.cs is only written once per project
* Add UseNuGetBuildExtensions to all entry points
* Move SdkProjects.props to Directory.Build.props, rename to targets
* Move to targets file only, NUGET_SNK_PATH is set after props for legacy csproj
* Remove unnecessary package references
@joelverhagen joelverhagen requested a review from a team as a code owner August 16, 2024 02:27
drewgillies
drewgillies previously approved these changes Aug 16, 2024
clairernovotny
clairernovotny previously approved these changes Aug 16, 2024
@joelverhagen joelverhagen merged commit a6c75d2 into main Aug 16, 2024
3 checks passed
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.