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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into live #36469

Merged
merged 12 commits into from
Aug 1, 2023
Merged

Merge main into live #36469

merged 12 commits into from
Aug 1, 2023

Conversation

ghost
Copy link

@ghost ghost commented Aug 1, 2023

Please don't squash-merge this PR.


Internal previews

Toggle expand/collapse
馃搫 File 馃敆 Preview link
docs/core/compatibility/3.1.md Breaking changes in .NET Core 3.1
docs/core/compatibility/6.0.md Breaking changes in .NET 6
docs/core/compatibility/7.0.md Breaking changes in .NET 7
docs/core/compatibility/8.0.md docs/core/compatibility/8.0
docs/core/compatibility/sdk/7.0/manifest-search.md docs/core/compatibility/sdk/7.0/manifest-search
docs/core/compatibility/sdk/8.0/default-image-tag.md docs/core/compatibility/sdk/8.0/default-image-tag
docs/core/deploying/trimming/prepare-libraries-for-trimming.md Prepare .NET libraries for trimming
docs/core/tools/dotnet-environment-variables.md .NET environment variables
docs/core/whats-new/dotnet-8.md What's new in .NET 8
docs/csharp/fundamentals/coding-style/coding-conventions.md Common C# Coding Conventions
docs/csharp/fundamentals/coding-style/identifier-names.md docs/csharp/fundamentals/coding-style/identifier-names
docs/csharp/programming-guide/delegates/using-delegates.md Using Delegates (C# Programming Guide)
docs/csharp/programming-guide/generics/generic-type-parameters.md Generic type parameters (C# Programming Guide)
docs/fundamentals/code-analysis/quality-rules/ca1865-ca1867.md docs/fundamentals/code-analysis/quality-rules/ca1865-ca1867
docs/fundamentals/code-analysis/quality-rules/index.md Code quality rules overview
docs/fundamentals/code-analysis/quality-rules/performance-warnings.md Performance rules
docs/standard/data/sqlite/database-errors.md docs/standard/data/sqlite/database-errors
docs/standard/linq/index.md LINQ overview

BillWagner and others added 12 commits July 31, 2023 07:47
* rearrange content

Make the new content organization follow better ordering.

* rewrite and update

Rewrite to match the docs team's accepted style.

* Edits to fix `var` issues

Fixes #26787: clarify "obvious"
Fixes #32633: add explanation, update variable names.
Fixes #34940: Explain that `var` is preferred in LINQ queries, despite other rules.

* Fix naming conventions

Fixes #30626: Clarify (again) that these are our guidelines, not yours. Point out that it's not the VS default, but a configuration option.
Fixes #30642: Again, our style.
Fixes #30799: Change constant style from ALL_CAPS to PascalCase to match runtime repo.
Fixes #33959: Update variable names so delegate types are PascalCased and instances of a delegate are camelCase. Add clarifying text for the same.

* Fix exception example

Fixes #31951 : Rewrite the exception example so that it's still obvious what can fail, but couldn't be easily anticipated before making the computation.

* Fixes #30897

Move the Generic type parameter naming conventions to the general naming conventions.

* Fix build warnings

* Reference runtime convention

The use of `_` and `s_` follow the runtime conventions. I'd missed that in the previous commit.

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

---------

Co-authored-by: David Pine <david.pine@microsoft.com>
See #36428 (comment)

For the issue involved, it's a better fix to create local variables for the Func and Action objects. That shows readers the distinction between the delegate type and the instance.
* Update prepare-libraries-for-trimming.md

Update to .NET 8

* Update prepare-libraries-for-trimming.md

* Update prepare-libraries-for-trimming.md

Remove horizontal scroll bar on tablets

* Update prepare-libraries-for-trimming.md
@dotnet-bot dotnet-bot added this to the August 2023 milestone Aug 1, 2023
@BillWagner BillWagner merged commit 097f52d into live Aug 1, 2023
28 of 30 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.

None yet

7 participants