Skip to content

Commit bf5eab0

Browse files
Merge pull request #42632 from dotnet/main
Merge main into live
2 parents 3d9dc25 + fadc18d commit bf5eab0

File tree

19 files changed

+205
-593
lines changed

19 files changed

+205
-593
lines changed

docfx.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@
5252
"csharp-10.0/*.md",
5353
"csharp-11.0/*.md",
5454
"csharp-12.0/*.md",
55-
"lock-object.md",
56-
"method-group-natural-type-improvements.md",
57-
"overload-resolution-priority.md",
58-
"params-collections.md",
59-
"ref-struct-interfaces.md",
60-
"ref-unsafe-in-iterators-async.md"
55+
"csharp-13.0/*.md"
6156
],
6257
"src": "_csharplang/proposals",
6358
"dest": "csharp/language-reference/proposals",
@@ -661,13 +656,15 @@
661656
"_csharplang/proposals/csharp-12.0/collection-expressions.md": "Collection expressions",
662657
"_csharplang/proposals/csharp-12.0/experimental-attribute.md": "Experimental attribute",
663658
"_csharplang/proposals/csharp-12.0/ref-readonly-parameters.md": "Ref readonly parameters",
664-
"_csharplang/proposals/lock-object.md": "Obey lock object semantics for lock statements",
665-
"_csharplang/proposals/method-group-natural-type-improvements.md": "Method group natural type improvements",
666-
"_csharplang/proposals/params-collections.md": "Params collections",
667-
"_csharplang/proposals/ref-unsafe-in-iterators-async.md": "Allow ref and unsafe in iterators and async methods",
668-
"_csharplang/proposals/ref-struct-interfaces.md": "Allow ref struct types to implement some interfaces",
669-
"_csharplang/proposals/partial-properties.md": "All partial properties and indexers",
670-
"_csharplang/proposals/overload-resolution-priority.md": "Overload resolution priority tiebreaker attribute",
659+
"_csharplang/proposals/csharp-13.0/collection-expressions-better-conversion.md": "Better conversion from collection expression",
660+
"_csharplang/proposals/csharp-13.0/esc-escape-sequence.md": "String/Character escape sequence '\\e'",
661+
"_csharplang/proposals/csharp-13.0/lock-object.md": "Obey lock object semantics for lock statements",
662+
"_csharplang/proposals/csharp-13.0/method-group-natural-type-improvements.md": "Method group natural type improvements",
663+
"_csharplang/proposals/csharp-13.0/params-collections.md": "Params collections",
664+
"_csharplang/proposals/csharp-13.0/ref-unsafe-in-iterators-async.md": "Allow ref and unsafe in iterators and async methods",
665+
"_csharplang/proposals/csharp-13.0/ref-struct-interfaces.md": "Allow ref struct types to implement some interfaces",
666+
"_csharplang/proposals/csharp-13.0/partial-properties.md": "All partial properties and indexers",
667+
"_csharplang/proposals/csharp-13.0/overload-resolution-priority.md": "Overload resolution priority tiebreaker attribute",
671668
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "C# compiler breaking changes since C# 10",
672669
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "C# compiler breaking changes since C# 11",
673670
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "C# compiler breaking changes since C# 12",
@@ -781,13 +778,15 @@
781778
"_csharplang/proposals/csharp-12.0/collection-expressions.md": "Collection expressions provide a concise syntax to initialize collections by defining elements or embedded collections as the source of the new collection's elements.",
782779
"_csharplang/proposals/csharp-12.0/experimental-attribute.md": "Use the ExperimentalAttribute attribute to indicate APIs that aren't stable.",
783780
"_csharplang/proposals/csharp-12.0/ref-readonly-parameters.md": "Ref readonly parameters enforce that arguments are passed by references, where `in` parameters allow the compiler some flexibiility.",
784-
"_csharplang/proposals/lock-object.md": "Special-case how `System.Threading.Lock` interacts with the `lock` keyword by calling its `EnterScope` method. Add static analysis warnings to prevent accidental misuse of the type where possible.",
785-
"_csharplang/proposals/method-group-natural-type-improvements.md": "This proposal refines the determination of the natural type of a method group by considering candidates scope-by-scope and pruning at each scope.",
786-
"_csharplang/proposals/params-collections.md": "Allow the `params` modifier on collection types beyond arrays, including `IEnumerable` types.",
787-
"_csharplang/proposals/ref-unsafe-in-iterators-async.md": "This proposal modifies restrictions to enable ref local variables and unsafe blocks in iterators and async methods",
788-
"_csharplang/proposals/ref-struct-interfaces.md": "This proposal provides features that enable interface authors to allow `ref struct` types to implement a particular interface",
789-
"_csharplang/proposals/partial-properties.md": "This proposal provides for partial properties and indexers, allowing the definition of a property or indexer to be split across multiple parts.",
790-
"_csharplang/proposals/overload-resolution-priority.md": "This proposal introduces a new attribute, `OverloadResolutionPriorityAttribute`, that can be applied to methods to influence overload resolution.",
781+
"_csharplang/proposals/csharp-13.0/collection-expressions-better-conversion.md": "Conversions from collection expressions match the element type before matching the collection type.",
782+
"_csharplang/proposals/csharp-13.0/esc-escape-sequence.md" : "The sequence '\\e' is now interpreted as the 'ESC' character, character point '0x1b'",
783+
"_csharplang/proposals/csharp-13.0/lock-object.md": "Special-case how `System.Threading.Lock` interacts with the `lock` keyword by calling its `EnterScope` method. Add static analysis warnings to prevent accidental misuse of the type where possible.",
784+
"_csharplang/proposals/csharp-13.0/method-group-natural-type-improvements.md": "This proposal refines the determination of the natural type of a method group by considering candidates scope-by-scope and pruning at each scope.",
785+
"_csharplang/proposals/csharp-13.0/params-collections.md": "Allow the `params` modifier on collection types beyond arrays, including `IEnumerable` types.",
786+
"_csharplang/proposals/csharp-13.0/ref-unsafe-in-iterators-async.md": "This proposal modifies restrictions to enable ref local variables and unsafe blocks in iterators and async methods",
787+
"_csharplang/proposals/csharp-13.0/ref-struct-interfaces.md": "This proposal provides features that enable interface authors to allow `ref struct` types to implement a particular interface",
788+
"_csharplang/proposals/csharp-13.0/partial-properties.md": "This proposal provides for partial properties and indexers, allowing the definition of a property or indexer to be split across multiple parts.",
789+
"_csharplang/proposals/csharp-13.0/overload-resolution-priority.md": "This proposal introduces a new attribute, `OverloadResolutionPriorityAttribute`, that can be applied to methods to influence overload resolution.",
791790
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10",
792791
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "Learn about any breaking changes since the initial release of C# 11",
793792
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "Learn about any breaking changes since the initial release of C# 12",

docs/azure/includes/dotnet-all.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
| Resource Management - Azure AI Search | NuGet [1.2.3](https://www.nuget.org/packages/Azure.ResourceManager.Search/1.2.3)<br>NuGet [1.3.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Search/1.3.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Search-readme) | GitHub [1.2.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Search_1.2.3/sdk/search/Azure.ResourceManager.Search/)<br>GitHub [1.3.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Search_1.3.0-beta.3/sdk/search/Azure.ResourceManager.Search/) |
167167
| Resource Management - Azure Stack HCI | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Hci/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Hci-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Hci_1.2.0/sdk/azurestackhci/Azure.ResourceManager.Hci/) |
168168
| Resource Management - Azure VMware Solution | NuGet [1.3.0](https://www.nuget.org/packages/Azure.ResourceManager.Avs/1.3.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Avs-readme) | GitHub [1.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Avs_1.3.0/sdk/avs/Azure.ResourceManager.Avs/) |
169-
| Resource Management - Batch | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.Batch/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Batch-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Batch_1.4.0/sdk/batch/Azure.ResourceManager.Batch/) |
169+
| Resource Management - Batch | NuGet [1.5.0](https://www.nuget.org/packages/Azure.ResourceManager.Batch/1.5.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Batch-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Batch_1.5.0/sdk/batch/Azure.ResourceManager.Batch/) |
170170
| Resource Management - Billing | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Billing/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Billing-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Billing_1.2.0/sdk/billing/Azure.ResourceManager.Billing/) |
171171
| Resource Management - Billing Benefits | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.BillingBenefits/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.BillingBenefits-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.BillingBenefits_1.0.0-beta.3/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/) |
172172
| Resource Management - Blueprint | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.Blueprint/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.Blueprint-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Blueprint_1.0.0-beta.4/sdk/blueprint/Azure.ResourceManager.Blueprint/) |
@@ -251,7 +251,7 @@
251251
| Resource Management - Load Testing | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.LoadTesting/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.LoadTesting-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.LoadTesting_1.1.0/sdk/loadtestservice/Azure.ResourceManager.LoadTesting/) |
252252
| Resource Management - Log Analytics | NuGet [1.2.2](https://www.nuget.org/packages/Azure.ResourceManager.OperationalInsights/1.2.2) | [docs](/dotnet/api/overview/azure/ResourceManager.OperationalInsights-readme) | GitHub [1.2.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.OperationalInsights_1.2.2/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/) |
253253
| Resource Management - Logic Apps | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Logic/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Logic-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Logic_1.1.0/sdk/logic/Azure.ResourceManager.Logic/) |
254-
| Resource Management - Machine Learning | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.MachineLearning/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.MachineLearning-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MachineLearning_1.2.0/sdk/machinelearningservices/Azure.ResourceManager.MachineLearning/) |
254+
| Resource Management - Machine Learning | NuGet [1.2.1](https://www.nuget.org/packages/Azure.ResourceManager.MachineLearning/1.2.1) | [docs](/dotnet/api/overview/azure/ResourceManager.MachineLearning-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MachineLearning_1.2.1/sdk/machinelearningservices/Azure.ResourceManager.MachineLearning/) |
255255
| Resource Management - Machine Learning Compute | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.MachineLearningCompute/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.MachineLearningCompute-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MachineLearningCompute_1.0.0-beta.4/sdk/machinelearningcompute/Azure.ResourceManager.MachineLearningCompute/) |
256256
| Resource Management - Maintenance | NuGet [1.1.2](https://www.nuget.org/packages/Azure.ResourceManager.Maintenance/1.1.2)<br>NuGet [1.2.0-beta.8](https://www.nuget.org/packages/Azure.ResourceManager.Maintenance/1.2.0-beta.8) | [docs](/dotnet/api/overview/azure/ResourceManager.Maintenance-readme) | GitHub [1.1.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Maintenance_1.1.2/sdk/maintenance/Azure.ResourceManager.Maintenance/)<br>GitHub [1.2.0-beta.8](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Maintenance_1.2.0-beta.8/sdk/maintenance/Azure.ResourceManager.Maintenance/) |
257257
| Resource Management - Managed Grafana | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Grafana/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Grafana-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Grafana_1.1.0/sdk/grafana/Azure.ResourceManager.Grafana/) |
@@ -350,8 +350,8 @@
350350
| Microsoft.Azure.DataFactoryTestingFramework.Expressions | NuGet [0.2.7](https://www.nuget.org/packages/Microsoft.Azure.DataFactoryTestingFramework.Expressions/0.2.7) | | |
351351
| Microsoft.Azure.Functions.Worker.OpenTelemetry | NuGet [1.0.0-preview1](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.OpenTelemetry/1.0.0-preview1) | | |
352352
| System Net Client Model | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/System.Net.ClientModel/1.0.0-beta.1) | | |
353-
| Unknown Display Name | NuGet [0.0.3-dev-20240910-1](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Image/0.0.3-dev-20240910-1) | | |
354-
| Unknown Display Name | NuGet [1.0.0](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Text/1.0.0)<br>NuGet [0.0.3-dev-20240910-1](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Text/0.0.3-dev-20240910-1) | | |
353+
| Unknown Display Name | NuGet [1.0.1-beta.1](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Image/1.0.1-beta.1) | | |
354+
| Unknown Display Name | NuGet [1.0.0](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Text/1.0.0)<br>NuGet [1.0.1-beta.1](https://www.nuget.org/packages/Azure.AI.ContentSafety.Extension.Embedded.Text/1.0.1-beta.1) | | |
355355
| Anomaly Detector | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.AnomalyDetector/1.0.0) | | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.AnomalyDetector_1.0.0-preview.1/sdk/cognitiveservices/AnomalyDetector) |
356356
| App Service | NuGet [0.2.2-alpha](https://www.nuget.org/packages/Microsoft.Azure.AppService/0.2.2-alpha) | | |
357357
| Application Insights | NuGet [0.9.0-preview](https://www.nuget.org/packages/Microsoft.Azure.ApplicationInsights/0.9.0-preview) | | |

0 commit comments

Comments
 (0)