Skip to content

Conversation

@v-alje
Copy link
Contributor

@v-alje v-alje commented Apr 10, 2023

Summary

This pull request updates the LOC snapshot to the latest version of the content from live.

gewarren and others added 30 commits March 15, 2023 09:57
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
@v-alje
Copy link
Contributor Author

v-alje commented Apr 10, 2023

@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.

@BillWagner
Copy link
Member

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.

@v-alje
Copy link
Contributor Author

v-alje commented Apr 12, 2023

@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.

@BillWagner
Copy link
Member

@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.

@v-alje
Copy link
Contributor Author

v-alje commented Apr 12, 2023

@BillWagner Yes please.

@BillWagner
Copy link
Member

closing per request.

@BillWagner BillWagner closed this Apr 12, 2023
@BillWagner
Copy link
Member

@v-alje

You should be all set. The release-loc-prod branch matches the current live branch now.

@v-alje
Copy link
Contributor Author

v-alje commented Apr 12, 2023

@BillWagner Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment