-
Notifications
You must be signed in to change notification settings - Fork 6k
Update LOC Snapshot from Live #34935
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
Conversation
Publish what's new updates for Preview 2
Bumps [Microsoft.Extensions.Localization](https://github.com/dotnet/aspnetcore) from 7.0.3 to 7.0.4. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](dotnet/aspnetcore@v7.0.3...v7.0.4) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Localization dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix the breadcrumb for the C# "advanced topics" section. There isn't an index in that folder, so defer to the first sub-section and it's overview article. Fixes #34604 Also, fix the redirection to this same article: The destination must include the training "/" to redirect to the (default) `index` in that folder.
* First draft of QUIC conceptual docs based on the blog post * Updated ToC * Markdown lint * Note wording * Feedback from validation * Feedback. * Apply suggestions from code review --------- Co-authored-by: Manicka <manicka@Manickas-MacBook-Pro.local> Co-authored-by: David Pine <david.pine@microsoft.com>
* Add note about VS to the .NET Framework ref assemblies article * Update docs/framework/migration-guide/reference-assemblies.md Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> * Add link to older VS downloads --------- Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
* Wip * SEO: WIP * A few more description updates * More updates * Let's just ship these changes for now * And these too * More tweaks * This should be good now * Apply suggestions from code review
Co-authored-by: BillWagner <BillWagner@users.noreply.github.com>
Extra blank line is causing a Markdown lint issue
* Allows command to work out of the box on Windows and UNIX machines * Makes command consistent with the others in the doc that use forward slashes
* Move files * Edit pass * fix links.
|
@gewarren Is there someone who can resolve the merge conflict with this branch and merge live into it? It would be best if it could be reset to the status and content of the live branch. |
* remove pattern matching specs * Fix warnings, take 1 I'm guessing this will take a few commits to get right.
…and details in the details doc. (#34937) * add note about async delegates https://devblogs.microsoft.com/dotnet/migrating-delegate-begininvoke-calls-for-net-core/ dotnet/runtime#16312 * other doc * feedback
|
Hi @v-alje Genevieve is out this week, and I can try to help. How did you create this PR? I'm confused by the number of conflicts, and I'm not sure how these two branches diverged as much as they have. |
|
@BillWagner I just opened a pull request from live into release-loc-prod. If the branch can be deleted and recreated from live it would work as well. LOC just wants a snapshot of the latest version of live. |
That's probably easiest (deleting this branch, and making a new release-loc-prod that matches the current live branch). Do you want me to do that? (LMK, and I'll get it done today. |
|
@BillWagner Yes please. |
|
closing per request. |
|
You should be all set. The |
|
@BillWagner Thank you! |
Summary
This pull request updates the LOC snapshot to the latest version of the content from live.