Skip to content

Commit f883c82

Browse files
Merge pull request #46808 from dotnet/main
Merge main into live
2 parents 1000613 + 11dcff5 commit f883c82

File tree

23 files changed

+225
-115
lines changed

23 files changed

+225
-115
lines changed

.openpublishing.redirection.csharp.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@
120120
"source_path_from_root": "/redirections/proposals/csharp-8.0/readonly-instance-members.md",
121121
"redirect_url": "/dotnet/csharp/language-reference/language-specification/structs#16411-properties"
122122
},
123+
{
124+
"source_path_from_root": "/redirections/proposals/csharp-8.0/null-coalescing-assignment.md",
125+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/expressions#1221-assignment-operators"
126+
},
127+
{
128+
"source_path_from_root": "/redirections/proposals/csharp-8.0/async-streams.md",
129+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/statements.md#13953-await-foreach"
130+
},
123131
{
124132
"source_path_from_root": "/redirections/proposals/csharp-9.0/nullable-reference-types-specification.md",
125133
"redirect_url": "/dotnet/csharp/language-reference/language-specification/types.md#893-nullable-reference-types"

docfx.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"simple-lambda-parameters-with-modifiers.md",
6161
"partial-events-and-constructors.md",
6262
"null-conditional-assignment.md",
63-
"extensions.md"
63+
"extensions.md",
64+
"user-defined-compound-assignment.md"
6465
],
6566
"src": "_csharplang/proposals",
6667
"dest": "csharp/language-reference/proposals",
@@ -81,6 +82,8 @@
8182
"csharp-8.0/nullable-reference-types-specification.md",
8283
"csharp-8.0/nested-stackalloc.md",
8384
"csharp-8.0/readonly-instance-members.md",
85+
"csharp-8.0/null-coalescing-assignment.md",
86+
"csharp-8.0/async-streams.md",
8487
"csharp-9.0/nullable-reference-types-specification.md",
8588
"csharp-9.0/nullable-constructor-analysis.md",
8689
"csharp-9.0/nullable-parameter-default-value-analysis.md",
@@ -618,10 +621,8 @@
618621
"_csharpstandard/standard/Bibliography.md": "Bibliography",
619622
"_csharplang/proposals/csharp-8.0/patterns.md": "Recursive pattern matching",
620623
"_csharplang/proposals/csharp-8.0/default-interface-methods.md": "Default interface methods",
621-
"_csharplang/proposals/csharp-8.0/async-streams.md": "Async streams",
622624
"_csharplang/proposals/csharp-8.0/ranges.md": "Ranges and indices",
623625
"_csharplang/proposals/csharp-8.0/using.md": "Pattern based using and using declarations",
624-
"_csharplang/proposals/csharp-8.0/null-coalescing-assignment.md": "Null coalescing assignment",
625626
"_csharplang/proposals/csharp-9.0/covariant-returns.md": "Covariant return types",
626627
"_csharplang/proposals/csharp-9.0/extending-partial-methods.md": "Extending partial methods",
627628
"_csharplang/proposals/csharp-9.0/extension-getenumerator.md": "Extension GetEnumerator support in foreach",
@@ -691,6 +692,7 @@
691692
"_csharplang/proposals/partial-events-and-constructors.md": "Partial events and constructors",
692693
"_csharplang/proposals/null-conditional-assignment.md": "Null conditional assignment",
693694
"_csharplang/proposals/extensions.md": "Extension members",
695+
"_csharplang/proposals/user-defined-compound-assignment.md": "User-defined compound assignment",
694696
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "C# compiler breaking changes since C# 10",
695697
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "C# compiler breaking changes since C# 11",
696698
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "C# compiler breaking changes since C# 12",
@@ -744,10 +746,8 @@
744746
"_csharpstandard/standard/Bibliography.md": "This appendix lists external standards referenced in this specification.",
745747
"_csharplang/proposals/csharp-8.0/patterns.md": "This feature specification describes recursive pattern matching, where patterns can nest inside other patterns.",
746748
"_csharplang/proposals/csharp-8.0/default-interface-methods.md": "This feature specification describe the syntax updates necessary to support default interface methods. This includes declaring bodies in interface declarations, and supporting modifiers on declarations.",
747-
"_csharplang/proposals/csharp-8.0/async-streams.md": "This feature specification describes async streams, which return streams of data asynchronously, typically as each element is produced or available.",
748749
"_csharplang/proposals/csharp-8.0/ranges.md": "This feature specification describes the syntax for ranges and indices, which support indexing individual elements of a sequence or a range of a sequence from the start or end of that sequence.",
749750
"_csharplang/proposals/csharp-8.0/using.md": "This feature specification supports pattern based using and using declarations to simplify resource cleanup.",
750-
"_csharplang/proposals/csharp-8.0/null-coalescing-assignment.md": "This feature specification describes the syntax to support null coalescing assignment expressions using the '??=' operator.",
751751
"_csharplang/proposals/csharp-9.0/covariant-returns.md": "This feature specification describes covariant return types, where overriding member declarations can return a type derived from the overridden member declaration.",
752752
"_csharplang/proposals/csharp-9.0/extending-partial-methods.md": "This feature specification describes extensions to partial methods. These extensions enable source generators to create or call partial methods.",
753753
"_csharplang/proposals/csharp-9.0/extension-getenumerator.md": "This feature specification describes the necessary pattern for an extension method to provide the GetEnumerator support in a foreach loop.",
@@ -817,6 +817,7 @@
817817
"_csharplang/proposals/partial-events-and-constructors.md": "This proposal allows partial events and constructors to be declared in partial classes. The event and constructor can be split across class declarations.",
818818
"_csharplang/proposals/null-conditional-assignment.md": "This proposal allows the null conditional operator to be used for the destination of assignment expressions. This allows you to assign a value to a property or field only if the left side is not null.",
819819
"_csharplang/proposals/extensions.md": "This proposal enables new kinds of extension members. These new extension members support extension properties, extension static members, including extension operators.",
820+
"_csharplang/proposals/user-defined-compound-assignment.md": "This proposal introduces user-defined compound assignment operators. Developers can override compound assignment, increment, and decrement operators.",
820821
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10 and included in C# 11",
821822
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "Learn about any breaking changes since the initial release of C# 11 and included in C# 12",
822823
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "Learn about any breaking changes since the initial release of C# 12 and included in C# 13",

0 commit comments

Comments
 (0)