Skip to content

Commit 74a3a53

Browse files
Merge pull request #44457 from dotnet/main
Merge main into live
2 parents 11574ca + 9d498cf commit 74a3a53

39 files changed

+489
-499
lines changed

.github/policies/label-prs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ configuration:
5656
- payloadType: Pull_Request
5757
- isActivitySender:
5858
user: azure-sdk
59+
- filesMatchPattern:
60+
pattern: docs/azure/includes/*
5961
then:
6062
- addLabel:
6163
label: ":octocat: auto-merge"

.openpublishing.redirection.csharp.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,10 @@
18261826
"source_path_from_root": "/docs/csharp/misc/cs1007.md",
18271827
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
18281828
},
1829+
{
1830+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1502.md",
1831+
"redirect_url": "/dotnet/csharp/misc/cs1503"
1832+
},
18291833
{
18301834
"source_path_from_root": "/docs/csharp/misc/cs1510.md",
18311835
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/ref-modifiers-errors"

docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
| Key Vault - Keys | NuGet [4.7.0](https://www.nuget.org/packages/Azure.Security.KeyVault.Keys/4.7.0) | [docs](/dotnet/api/overview/azure/Security.KeyVault.Keys-readme) | GitHub [4.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.KeyVault.Keys_4.7.0/sdk/keyvault/Azure.Security.KeyVault.Keys/) |
6161
| Key Vault - Secrets | NuGet [4.7.0](https://www.nuget.org/packages/Azure.Security.KeyVault.Secrets/4.7.0) | [docs](/dotnet/api/overview/azure/Security.KeyVault.Secrets-readme) | GitHub [4.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.KeyVault.Secrets_4.7.0/sdk/keyvault/Azure.Security.KeyVault.Secrets/) |
6262
| Language Text | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Language.Text/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Language.Text-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Language.Text_1.0.0-beta.2/sdk/cognitivelanguage/Azure.AI.Language.Text/) |
63-
| Load Testing | NuGet [1.0.1](https://www.nuget.org/packages/Azure.Developer.LoadTesting/1.0.1) | [docs](/dotnet/api/overview/azure/Developer.LoadTesting-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Developer.LoadTesting_1.0.1/sdk/loadtestservice/Azure.Developer.LoadTesting/) |
63+
| Load Testing | NuGet [1.0.2](https://www.nuget.org/packages/Azure.Developer.LoadTesting/1.0.2) | [docs](/dotnet/api/overview/azure/Developer.LoadTesting-readme) | GitHub [1.0.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Developer.LoadTesting_1.0.2/sdk/loadtestservice/Azure.Developer.LoadTesting/) |
6464
| Maps Common | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.Maps.Common/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/Maps.Common-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Common_1.0.0-beta.4/sdk/maps/Azure.Maps.Common/) |
6565
| Maps Geolocation | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Maps.Geolocation/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Maps.Geolocation-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Geolocation_1.0.0-beta.3/sdk/maps/Azure.Maps.Geolocation/) |
6666
| Maps Render | NuGet [2.0.0-beta.1](https://www.nuget.org/packages/Azure.Maps.Rendering/2.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Maps.Rendering-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [2.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Rendering_2.0.0-beta.1/sdk/maps/Azure.Maps.Rendering/) |
@@ -306,7 +306,7 @@
306306
| Resource Management - Purview | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Purview/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Purview/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Purview-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Purview_1.1.0/sdk/purview/Azure.ResourceManager.Purview/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Purview_1.2.0-beta.1/sdk/purview/Azure.ResourceManager.Purview/) |
307307
| Resource Management - Quantum | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Quantum/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Quantum-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quantum_1.0.0-beta.5/sdk/quantum/Azure.ResourceManager.Quantum/) |
308308
| Resource Management - Qumulo | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Qumulo/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Qumulo-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Qumulo_1.1.0/sdk/qumulo/Azure.ResourceManager.Qumulo/) |
309-
| Resource Management - Quota | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.0.0)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Quota-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.0.0/sdk/quota/Azure.ResourceManager.Quota/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.1.0-beta.2/sdk/quota/Azure.ResourceManager.Quota/) |
309+
| Resource Management - Quota | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.0.0)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Quota-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.0.0/sdk/quota/Azure.ResourceManager.Quota/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.1.0-beta.3/sdk/quota/Azure.ResourceManager.Quota/) |
310310
| Resource Management - Recovery Services | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServices/1.1.1)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServices/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServices-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServices_1.1.1/sdk/recoveryservices/Azure.ResourceManager.RecoveryServices/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServices_1.2.0-beta.1/sdk/recoveryservices/Azure.ResourceManager.RecoveryServices/) |
311311
| Resource Management - Recovery Services Backup | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesBackup/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesBackup-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesBackup_1.2.0/sdk/recoveryservices-backup/Azure.ResourceManager.RecoveryServicesBackup/) |
312312
| Resource Management - Recovery Services Data Replication | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesDataReplication/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesDataReplication-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesDataReplication_1.0.0-beta.2/sdk/recoveryservices-datareplication/Azure.ResourceManager.RecoveryServicesDataReplication/) |

docs/azure/includes/dotnet-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
| Key Vault - Keys | NuGet [4.7.0](https://www.nuget.org/packages/Azure.Security.KeyVault.Keys/4.7.0) | [docs](/dotnet/api/overview/azure/Security.KeyVault.Keys-readme) | GitHub [4.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.KeyVault.Keys_4.7.0/sdk/keyvault/Azure.Security.KeyVault.Keys/) |
6262
| Key Vault - Secrets | NuGet [4.7.0](https://www.nuget.org/packages/Azure.Security.KeyVault.Secrets/4.7.0) | [docs](/dotnet/api/overview/azure/Security.KeyVault.Secrets-readme) | GitHub [4.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.KeyVault.Secrets_4.7.0/sdk/keyvault/Azure.Security.KeyVault.Secrets/) |
6363
| Language Text | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Language.Text/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Language.Text-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Language.Text_1.0.0-beta.2/sdk/cognitivelanguage/Azure.AI.Language.Text/) |
64-
| Load Testing | NuGet [1.0.1](https://www.nuget.org/packages/Azure.Developer.LoadTesting/1.0.1) | [docs](/dotnet/api/overview/azure/Developer.LoadTesting-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Developer.LoadTesting_1.0.1/sdk/loadtestservice/Azure.Developer.LoadTesting/) |
64+
| Load Testing | NuGet [1.0.2](https://www.nuget.org/packages/Azure.Developer.LoadTesting/1.0.2) | [docs](/dotnet/api/overview/azure/Developer.LoadTesting-readme) | GitHub [1.0.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Developer.LoadTesting_1.0.2/sdk/loadtestservice/Azure.Developer.LoadTesting/) |
6565
| Maps Common | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.Maps.Common/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/Maps.Common-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.Maps.Common_1.0.0-beta.4/sdk/maps/Azure.Maps.Common/) |
6666
| Maps Geolocation | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Maps.Geolocation/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Maps.Geolocation-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.Maps.Geolocation_1.0.0-beta.3/sdk/maps/Azure.Maps.Geolocation/) |
6767
| Maps Render | NuGet [2.0.0-beta.1](https://www.nuget.org/packages/Azure.Maps.Rendering/2.0.0-beta.1) | [docs](/dotnet/api/overview/azure/Maps.Rendering-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [2.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Maps.Rendering_2.0.0-beta.1/sdk/maps/Azure.Maps.Rendering/) |
@@ -313,7 +313,7 @@
313313
| Resource Management - Purview | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Purview/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Purview/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Purview-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Purview_1.1.0/sdk/purview/Azure.ResourceManager.Purview/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Purview_1.2.0-beta.1/sdk/purview/Azure.ResourceManager.Purview/) |
314314
| Resource Management - Quantum | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.Quantum/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.Quantum-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quantum_1.0.0-beta.5/sdk/quantum/Azure.ResourceManager.Quantum/) |
315315
| Resource Management - Qumulo | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.Qumulo/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Qumulo-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Qumulo_1.1.0/sdk/qumulo/Azure.ResourceManager.Qumulo/) |
316-
| Resource Management - Quota | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.0.0)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Quota-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.0.0/sdk/quota/Azure.ResourceManager.Quota/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.1.0-beta.2/sdk/quota/Azure.ResourceManager.Quota/) |
316+
| Resource Management - Quota | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.0.0)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Quota/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Quota-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.0.0/sdk/quota/Azure.ResourceManager.Quota/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Quota_1.1.0-beta.3/sdk/quota/Azure.ResourceManager.Quota/) |
317317
| Resource Management - Recovery Services | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServices/1.1.1)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServices/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServices-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServices_1.1.1/sdk/recoveryservices/Azure.ResourceManager.RecoveryServices/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServices_1.2.0-beta.1/sdk/recoveryservices/Azure.ResourceManager.RecoveryServices/) |
318318
| Resource Management - Recovery Services Backup | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesBackup/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesBackup-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesBackup_1.2.0/sdk/recoveryservices-backup/Azure.ResourceManager.RecoveryServicesBackup/) |
319319
| Resource Management - Recovery Services Data Replication | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesDataReplication/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesDataReplication-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesDataReplication_1.0.0-beta.2/sdk/recoveryservices-datareplication/Azure.ResourceManager.RecoveryServicesDataReplication/) |

docs/core/testing/mstest-analyzers/mstest0003.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Test methods (methods marked with the `[TestMethod]` attribute) should follow th
3737

3838
- they should be `public` (or `internal` if `[assembly: DiscoverInternals]` attribute is set)
3939
- they should not be `static`
40-
- they should not be generic
40+
- they should not be generic if using MSTest 3.7 or earlier
4141
- they should not be `abstract`
4242
- they should return `void` or `Task`
4343
- they should not be `async void`

docs/core/whats-new/dotnet-5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ For more information on project templates from the .NET CLI, see [`dotnet new`](
134134
There are new features in and for [System.Text.Json](../../standard/serialization/system-text-json/overview.md):
135135

136136
- [Preserve references and handle circular references](../../standard/serialization/system-text-json/preserve-references.md)
137-
- [HttpClient and HttpContent extension methods](../../standard/serialization/system-text-json/overview.md#httpclient-and-httpcontent-extension-methods)
137+
- [Serialization extension methods on HttpClient](../../standard/serialization/system-text-json/httpclient-extensions.md)
138138
- [Allow or write numbers in quotes](../../standard/serialization/system-text-json/invalid-json.md#allow-or-write-numbers-in-quotes)
139139
- [Support immutable types and C# 9 Records](../../standard/serialization/system-text-json/immutability.md)
140140
- [Support non-public property accessors](../../standard/serialization/system-text-json/immutability.md)

docs/csharp/fundamentals/program-structure/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ C# programs consist of one or more files. Each file contains zero or more namesp
1212

1313
:::code language="csharp" source="snippets/toplevel-structure/Program.cs":::
1414

15-
The preceding example uses [*top-level statements*](top-level-statements.md) for the program's entry point. Only one file can have top-level statements. The program's entry point is the first line of program text in that file. You can also create a static method named [`Main`](main-command-line.md) as the program's entry point, as shown in the following example:
15+
The preceding example uses [*top-level statements*](top-level-statements.md) for the program's entry point. Only one file can have top-level statements. The program's entry point is the first line of program text in that file. In this case, it's the `Console.WriteLine("Hello world!");`.
16+
You can also create a static method named [`Main`](main-command-line.md) as the program's entry point, as shown in the following example:
1617

1718
:::code language="csharp" source="snippets/structure/Program.cs":::
1819

20+
In that case the program will start in the first line of `Main` method, which is `Console.WriteLine("Hello world!");`
21+
1922
## Related Sections
2023

2124
You learn about these program elements in the [types](../types/index.md) section of the fundamentals guide:

0 commit comments

Comments
 (0)