Skip to content

Commit 7f4fb9c

Browse files
authored
Merge pull request #53887 from gewarren/publish-0519
Merge main into live
2 parents ebe4425 + ed0f482 commit 7f4fb9c

32 files changed

Lines changed: 60 additions & 127 deletions

File tree

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{
5656
"path_to_root": "_csharpstandard",
5757
"url": "https://github.com/dotnet/csharpstandard",
58-
"branch": "alpha-v10",
58+
"branch": "v11-alpha",
5959
"include_in_build": true,
6060
"branch_mapping": {}
6161
},

.openpublishing.redirection.csharp.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@
502502
},
503503
{
504504
"source_path_from_root": "/redirections/proposals/csharp-10.0/generic-attributes.md",
505-
"redirect_url": "/dotnet/csharp/language-reference/proposals/csharp-11.0/generic-attributes"
505+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/attributes#232-attribute-classes"
506506
},
507507
{
508508
"source_path_from_root": "/docs/csharp/async.md",
@@ -2055,7 +2055,7 @@
20552055
},
20562056
{
20572057
"source_path_from_root": "/docs/csharp/language-reference/proposals/csharp-11.0/index.md",
2058-
"redirect_url": "/dotnet/csharp/language-reference/proposals/csharp-11.0/static-abstracts-in-interfaces"
2058+
"redirect_url": "/dotnet/csharp/language-reference/language-specification/interfaces#1947-interface-operators"
20592059
},
20602060
{
20612061
"source_path_from_root": "/docs/csharp/language-reference/specifications.md",

docfx.json

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
},
5050
{
5151
"files": [
52-
"csharp-11.0/*.md",
5352
"csharp-12.0/*.md",
5453
"csharp-13.0/*.md",
5554
"csharp-14.0/*.md",
@@ -505,7 +504,6 @@
505504
},
506505
"ms.date": {
507506
"_csharpstandard/standard/*.md": "09/12/2025",
508-
"_csharplang/proposals/csharp-11.0/*.md": "09/30/2022",
509507
"_csharplang/proposals/csharp-12.0/*.md": "08/15/2023",
510508
"_csharplang/proposals/csharp-13.0/*.md": "10/31/2024",
511509
"_csharplang/proposals/csharp-14.0/*.md": "08/06/2025",
@@ -618,22 +616,6 @@
618616
"_csharpstandard/standard/standard-library.md": "Standard library",
619617
"_csharpstandard/standard/documentation-comments.md": "Documentation comments",
620618
"_csharpstandard/standard/Bibliography.md": "Bibliography",
621-
"_csharplang/proposals/csharp-11.0/generic-attributes.md": "Generic attributes",
622-
"_csharplang/proposals/csharp-11.0/auto-default-structs.md": "Auto-default struct",
623-
"_csharplang/proposals/csharp-11.0/checked-user-defined-operators.md": "Checked user defined operators",
624-
"_csharplang/proposals/csharp-11.0/extended-nameof-scope.md": "Extended nameof parameter scope",
625-
"_csharplang/proposals/csharp-11.0/file-local-types.md": "File local types",
626-
"_csharplang/proposals/csharp-11.0/list-patterns.md": "List patterns",
627-
"_csharplang/proposals/csharp-11.0/low-level-struct-improvements.md": "Low level struct improvements",
628-
"_csharplang/proposals/csharp-11.0/new-line-in-interpolation.md": "Interpolated string expression newline",
629-
"_csharplang/proposals/csharp-11.0/numeric-intptr.md": "Numeric IntPtr",
630-
"_csharplang/proposals/csharp-11.0/pattern-match-span-of-char-on-string.md": "Pattern match Span<char>",
631-
"_csharplang/proposals/csharp-11.0/raw-string-literal.md": "Raw string literal",
632-
"_csharplang/proposals/csharp-11.0/relaxing_shift_operator_requirements.md": "Relaxed right shift requirement",
633-
"_csharplang/proposals/csharp-11.0/required-members.md": "Required members",
634-
"_csharplang/proposals/csharp-11.0/static-abstracts-in-interfaces.md": "Static abstract methods in interfaces",
635-
"_csharplang/proposals/csharp-11.0/unsigned-right-shift-operator.md": "Unsigned right shift operator",
636-
"_csharplang/proposals/csharp-11.0/utf8-string-literals.md": "UTF-8 string literals",
637619
"_csharplang/proposals/csharp-12.0/primary-constructors.md": "Primary constructors",
638620
"_csharplang/proposals/csharp-12.0/using-alias-types.md": "Alias any type",
639621
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
@@ -717,22 +699,6 @@
717699
"_csharpstandard/standard/standard-library.md": "This appendix lists requirements of the specification library. The C# language relies on these types for some of its behavior.",
718700
"_csharpstandard/standard/documentation-comments.md": "This appendix describes XML comments that are used to document your program.",
719701
"_csharpstandard/standard/Bibliography.md": "This appendix lists external standards referenced in this specification.",
720-
"_csharplang/proposals/csharp-11.0/generic-attributes.md": "This feature specification describes generic attributes, where a generic class may derive from 'System.Attribute'.",
721-
"_csharplang/proposals/csharp-11.0/auto-default-structs.md": "This feature updates the rules for struct initialization and default values. This feature standardizes the behavior for default struct values and newly initialized structs.",
722-
"_csharplang/proposals/csharp-11.0/checked-user-defined-operators.md": "This feature enables checked and unchecked alternatives for some operators.",
723-
"_csharplang/proposals/csharp-11.0/extended-nameof-scope.md": "This feature enables the nameof expression to be used with parameter names in a method declaration.",
724-
"_csharplang/proposals/csharp-11.0/file-local-types.md": "This feature allows you to create types (either structs or classes) that are visibile only in the file in which they are declared. This is primarily useful for source generators.",
725-
"_csharplang/proposals/csharp-11.0/list-patterns.md": "This feature describes enhancements to pattern matching to support patterns in lists of elements.",
726-
"_csharplang/proposals/csharp-11.0/low-level-struct-improvements.md": "This feature specification describes several features that improve the performance of `struct` types: `ref` fields and overriding lifetime defaults.",
727-
"_csharplang/proposals/csharp-11.0/new-line-in-interpolation.md": "This feature describes changes to allow newlines in the interpolation expressions in an interpolated string expression.",
728-
"_csharplang/proposals/csharp-11.0/numeric-intptr.md": "This feature enables the IntPtr and UIntPtr to be treated as the numeric types nint and nuint, respectively.",
729-
"_csharplang/proposals/csharp-11.0/pattern-match-span-of-char-on-string.md": "This feature enables a Span<char> to pattern match a literal string value.",
730-
"_csharplang/proposals/csharp-11.0/raw-string-literal.md": "This feature describes raw string literals. Raw string literals enable string literals to avoid almost all escape sequences.",
731-
"_csharplang/proposals/csharp-11.0/relaxing_shift_operator_requirements.md": "This feature removes the restriction that the right operand of a right shift must be an integer.",
732-
"_csharplang/proposals/csharp-11.0/required-members.md": "This feature defines the required modifier. The required modifier instructs the compiler that a field or property must be initialized during the construction of a new object.",
733-
"_csharplang/proposals/csharp-11.0/static-abstracts-in-interfaces.md": "This feature enables an interface to define static members. This enables interfaces to define operators that must be provided by implementing types.",
734-
"_csharplang/proposals/csharp-11.0/unsigned-right-shift-operator.md": "This feature defines a logical right-shift operator, `>>>`. The logical right shift operator always shifts in 0 values in the left-most bits during a shift.",
735-
"_csharplang/proposals/csharp-11.0/utf8-string-literals.md": "This feature enables the `u8` suffix on a string literal. The `u8` suffix instructs the compiler to convert the UTF-8 string literal to a `ReadOnlySpan<byte>`.",
736702
"_csharplang/proposals/csharp-12.0/primary-constructors.md": "Primary constructors put the parameters of one constructor in scope for the whole class or struct to be used for initialization or directly as object state. The trade-off is that any other constructors must call through the primary constructor.",
737703
"_csharplang/proposals/csharp-12.0/using-alias-types.md": "Using directives can alias any type, not just named types. You can create aliases for tuple types, generics and more.",
738704
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
@@ -785,7 +751,6 @@
785751
"titleSuffix": {
786752
"docs/**/*.{md,yml}": ".NET",
787753
"_csharpstandard/standard/*.md": "C# language specification",
788-
"_csharplang/proposals/csharp-11.0/*.md": "C# feature specifications",
789754
"_csharplang/proposals/csharp-12.0/*.md": "C# feature specifications",
790755
"_csharplang/proposals/csharp-13.0/*.md": "C# feature specifications",
791756
"_csharplang/proposals/csharp-14.0/*.md": "C# feature specifications",

docs/azure/includes/dotnet-all.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
| Commerce Usage Aggregates | NuGet [1.5.3](https://www.nuget.org/packages/Microsoft.Azure.Commerce.UsageAggregates/1.5.3) | | |
512512
| Common | NuGet [2.2.1](https://www.nuget.org/packages/Microsoft.Azure.Common/2.2.1) | | |
513513
| Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) | | |
514-
| Cosmos DB | NuGet [3.58.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.58.0)<br>NuGet [3.60.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.60.0-preview.0) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.58.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
514+
| Cosmos DB | NuGet [3.58.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.58.0)<br>NuGet [3.61.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.61.0-preview.0) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.58.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
515515
| Data Lake Analytics | NuGet [1.4.211011](https://www.nuget.org/packages/Microsoft.Azure.DataLake.USQL.SDK/1.4.211011) | | |
516516
| Data Movement | NuGet [2.0.5](https://www.nuget.org/packages/Microsoft.Azure.Storage.DataMovement/2.0.5) | | GitHub [2.0.5](https://github.com/Azure/azure-storage-net-data-movement/tree/v1.3.0) |
517517
| DCAP | NuGet [1.13.1](https://www.nuget.org/packages/Microsoft.Azure.DCAP/1.13.1) | | GitHub [1.13.1](https://github.com/microsoft/Azure-DCAP-Client/tree/1.6) |

docs/core/porting/github-copilot-app-modernization/toc.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,4 @@ items:
3030
href: troubleshooting.md
3131

3232
- name: Migrate .NET apps to Azure
33-
expanded: true
34-
items:
35-
- name: Migrate a .NET project
36-
href: ../../../azure/migration/appmod/quickstart.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
37-
- name: Migration sample
38-
href: ../../../azure/migration/appmod/sample.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
39-
- name: Copilot CLI Support
40-
href: ../../../azure/migration/appmod/copilot-cli-support.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
41-
- name: Coding Agent Support
42-
href: ../../../azure/migration/appmod/coding-agent-support.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
33+
href: ../../../azure/migration/appmod/predefined-tasks.md

docs/csharp/language-reference/attributes/general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ The `AsyncMethodBuilder` attribute can be applied to an async method to override
189189

190190
You use these attributes to specify that a type is an *interpolated string handler*. The .NET 6 library already includes <xref:System.Runtime.CompilerServices.DefaultInterpolatedStringHandler?displayProperty=nameWithType> for scenarios where you use an interpolated string as the argument for a `string` parameter. You might have other instances where you want to control how interpolated strings are processed. You apply the <xref:System.Runtime.CompilerServices.InterpolatedStringHandlerAttribute?displayProperty=nameWithType> to the type that implements your handler. You apply the <xref:System.Runtime.CompilerServices.InterpolatedStringHandlerArgumentAttribute?displayProperty=nameWithType> to parameters of that type's constructor.
191191

192-
You can learn more about building an interpolated string handler in the [interpolated string expression handlers](~/_csharpstandard/standard/attributes.md#23591-custom-interpolated-string-expression-handlers) clause of the C# standard.
192+
You can learn more about building an interpolated string handler in the [interpolated string expression handlers](~/_csharpstandard/standard/attributes.md#235101-custom-interpolated-string-expression-handlers) clause of the C# standard.
193193

194194
## `ModuleInitializer` attribute
195195

docs/csharp/language-reference/builtin-types/default-values.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For more information, see the following sections of the [C# language specificati
5858
- [Default values](~/_csharpstandard/standard/variables.md#93-default-values)
5959
- [Default constructors](~/_csharpstandard/standard/types.md#833-default-constructors)
6060
- [Parameterless struct constructors](~/_csharpstandard/standard/structs.md#1659-constructors)
61-
- [Auto default structs](~/_csharplang/proposals/csharp-11.0/auto-default-structs.md)
61+
- [Auto default structs](~/_csharpstandard/standard/structs.md#16581-field-initializers)
6262

6363
## See also
6464

docs/csharp/language-reference/builtin-types/integral-numeric-types.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ For more information, see the following sections of the [C# language specificati
156156
- [Integral types](~/_csharpstandard/standard/types.md#836-integral-types)
157157
- [Integer literals](~/_csharpstandard/standard/lexical-structure.md#6453-integer-literals)
158158
- [Native sized integral types](~/_csharpstandard/standard/types.md#836-integral-types)
159-
- [Numeric `IntPtr` and `UIntPtr`](~/_csharplang/proposals/csharp-11.0/numeric-intptr.md)
160159

161160
## See also
162161

docs/csharp/language-reference/builtin-types/ref-struct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ For more information, see the following sections of the [C# language specificati
8787
- [Structs: Ref modifier](~/_csharpstandard/standard/structs.md#1623-ref-modifier)
8888
- [Safe context constraint for ref struct types](~/_csharpstandard/standard/structs.md#16515-safe-context-constraint)
8989

90-
For more information about `ref` fields, see the [Low-level struct improvements](~/_csharplang/proposals/csharp-11.0/low-level-struct-improvements.md) proposal note.
90+
For more information about `ref` fields, see [Ref fields](~/_csharpstandard/standard/structs.md#16582-ref-fields) in the C# language specification.
9191

9292
## See also
9393

docs/csharp/language-reference/builtin-types/reference-types.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@ For more information, see the following sections of the [C# language specificati
283283
- [§8.2.4 The dynamic type](~/_csharpstandard/standard/types.md#824-the-dynamic-type)
284284
- [§8.2.5 The string type](~/_csharpstandard/standard/types.md#825-the-string-type)
285285
- [§8.2.8 Delegate types](~/_csharpstandard/standard/types.md#828-delegate-types)
286-
- [Raw string literals](~/_csharplang/proposals/csharp-11.0/raw-string-literal.md)
287-
- [UTF-8 string literals](~/_csharplang/proposals/csharp-11.0/utf8-string-literals.md)
286+
- [§6.4.5.6 String literals](~/_csharpstandard/standard/lexical-structure.md#6456-string-literals)
288287

289288
### See also
290289

0 commit comments

Comments
 (0)