Skip to content

Commit a65cfa2

Browse files
Merge pull request #50119 from dotnet/main
Merge main into live
2 parents 851301b + 6c01dc3 commit a65cfa2

File tree

11 files changed

+36
-26
lines changed

11 files changed

+36
-26
lines changed

docs/azure/includes/dotnet-all.md

Lines changed: 16 additions & 9 deletions
Large diffs are not rendered by default.

docs/azure/includes/dotnet-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
| Communication Phone Numbers | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.5.0) | [docs](/dotnet/api/overview/azure/Communication.PhoneNumbers-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.5.0/sdk/communication/Azure.Communication.PhoneNumbers/) |
2424
| Communication Rooms | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Rooms/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Rooms-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Rooms_1.2.0/sdk/communication/Azure.Communication.Rooms/) |
2525
| Communication SMS | NuGet [1.0.2](https://www.nuget.org/packages/Azure.Communication.Sms/1.0.2)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.Communication.Sms/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/Communication.Sms-readme) | GitHub [1.0.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Sms_1.0.2/sdk/communication/Azure.Communication.Sms/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Sms_1.1.0-beta.3/sdk/communication/Azure.Communication.Sms/) |
26-
| Compute Batch | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Compute.Batch/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/Compute.Batch-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.Compute.Batch_1.0.0-beta.3/sdk/batch/Azure.Compute.Batch/) |
26+
| Compute Batch | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.Compute.Batch/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/Compute.Batch-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.Compute.Batch_1.0.0-beta.4/sdk/batch/Azure.Compute.Batch/) |
2727
| Confidential Ledger | NuGet [1.3.0](https://www.nuget.org/packages/Azure.Security.ConfidentialLedger/1.3.0)<br>NuGet [1.4.1-beta.2](https://www.nuget.org/packages/Azure.Security.ConfidentialLedger/1.4.1-beta.2) | [docs](/dotnet/api/overview/azure/Security.ConfidentialLedger-readme) | GitHub [1.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.ConfidentialLedger_1.3.0/sdk/confidentialledger/Azure.Security.ConfidentialLedger/)<br>GitHub [1.4.1-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Security.ConfidentialLedger_1.4.1-beta.2/sdk/confidentialledger/Azure.Security.ConfidentialLedger/) |
2828
| Container Registry | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Containers.ContainerRegistry/1.2.0) | [docs](/dotnet/api/overview/azure/Containers.ContainerRegistry-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Containers.ContainerRegistry_1.2.0/sdk/containerregistry/Azure.Containers.ContainerRegistry/) |
2929
| Content Safety | NuGet [1.0.0](https://www.nuget.org/packages/Azure.AI.ContentSafety/1.0.0) | [docs](/dotnet/api/overview/azure/AI.ContentSafety-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.ContentSafety_1.0.0/sdk/contentsafety/Azure.AI.ContentSafety/) |
@@ -244,7 +244,7 @@
244244
| Resource Management - Data Share | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.DataShare/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DataShare-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DataShare_1.1.1/sdk/datashare/Azure.ResourceManager.DataShare/) |
245245
| Resource Management - Database Fleet Manager | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.DatabaseFleetManager/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DatabaseFleetManager-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DatabaseFleetManager_1.0.0-beta.1/sdk/fleet/Azure.ResourceManager.DatabaseFleetManager/) |
246246
| Resource Management - Database Watcher | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.DatabaseWatcher/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DatabaseWatcher-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DatabaseWatcher_1.0.0-beta.1/sdk/databasewatcher/Azure.ResourceManager.DatabaseWatcher/) |
247-
| Resource Management - Datadog | NuGet [1.0.0-beta.6](https://www.nuget.org/packages/Azure.ResourceManager.Datadog/1.0.0-beta.6) | [docs](/dotnet/api/overview/azure/ResourceManager.Datadog-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.6](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Datadog_1.0.0-beta.6/sdk/datadog/Azure.ResourceManager.Datadog/) |
247+
| Resource Management - Datadog | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Datadog/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Datadog-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Datadog_1.0.0/sdk/datadog/Azure.ResourceManager.Datadog/) |
248248
| Resource Management - Defender EASM | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.DefenderEasm/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.DefenderEasm-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.DefenderEasm_1.0.0-beta.3/sdk/defendereasm/Azure.ResourceManager.DefenderEasm/) |
249249
| Resource Management - Dell.Storage | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Dell.Storage/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Dell.Storage-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Dell.Storage_1.0.0-beta.1/sdk/dellstorage/Azure.ResourceManager.Dell.Storage/) |
250250
| Resource Management - Dependencymap | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.DependencyMap/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DependencyMap-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DependencyMap_1.0.0-beta.1/sdk/dependencymap/Azure.ResourceManager.DependencyMap/) |

docs/core/compatibility/sdk/10.0/code-coverage-dynamic-native-instrumentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Running `dotnet test --collect:"Code Coverage"` now disables dynamic native inst
1616

1717
## Previous behavior
1818

19-
Previously, dynamic native instrumentation was enabled by default and used a fallback for native modules when static native instrumentation couldn't be used. This behavior is described in [Static and dynamic native instrumentation](/visualstudio/test/customizing-code-coverage-analysis?view=vs-2022#static-and-dynamic-native-instrumentation).
19+
Previously, dynamic native instrumentation was enabled by default and used a fallback for native modules when static native instrumentation couldn't be used. This behavior is described in [Static and dynamic native instrumentation](/visualstudio/test/customizing-code-coverage-analysis#static-and-dynamic-native-instrumentation).
2020

2121
```bash
2222
dotnet test --collect:"Code Coverage"

docs/core/runtime-config/debugging-profiling.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ This article details the settings you can use to configure .NET debugging and pr
3535

3636
- Specifies the GUID of the profiler to load into the currently running process.
3737

38-
| | Setting name | Values |
39-
| - | - | - |
40-
| **runtimeconfig.json** | N/A | N/A |
38+
| | Setting name | Values |
39+
|--------------------------|-----------------------------------------|---------------|
40+
| **runtimeconfig.json** | N/A | N/A |
4141
| **Environment variable** | `CORECLR_PROFILER` or `DOTNET_PROFILER` | *string-guid* |
4242

4343
## Profiler location
@@ -49,11 +49,11 @@ Once profiling is enabled, the profiler can be loaded in two ways: with environm
4949
- Specifies the path to the profiler DLL to load into the currently running process (or 32-bit or 64-bit process).
5050
- If more than one variable is set, the bitness-specific variables take precedence. They specify which bitness of profiler to load.
5151

52-
| | Setting name | Values |
53-
| - | - | - |
54-
| **Environment variable** | `CORECLR_PROFILER_PATH` or `DOTNET_PROFILER_PATH` | *string-path* |
55-
| **Environment variable** | `CORECLR_PROFILER_PATH_32` or `DOTNET_PROFILER_PATH_32` | *string-path* |
56-
| **Environment variable** | `CORECLR_PROFILER_PATH_64` or `DOTNET_PROFILER_PATH_64` | *string-path* |
52+
| | Setting name | Values |
53+
|--------------------------|---------------------------------------------------------------|---------------|
54+
| **Environment variable** | `CORECLR_PROFILER_PATH` or `DOTNET_PROFILER_PATH` | *string-path* |
55+
| **Environment variable** | `CORECLR_PROFILER_PATH_32` or `DOTNET_PROFILER_PATH_32` | *string-path* |
56+
| **Environment variable** | `CORECLR_PROFILER_PATH_64` or `DOTNET_PROFILER_PATH_64` | *string-path* |
5757
| **Environment variable** | `CORECLR_PROFILER_PATH_ARM32` or `DOTNET_PROFILER_PATH_ARM32` | *string-path* |
5858
| **Environment variable** | `CORECLR_PROFILER_PATH_ARM64` or `DOTNET_PROFILER_PATH_ARM64` | *string-path* |
5959

docs/csharp/language-reference/keywords/method-parameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You apply one of the following modifiers to a parameter declaration to pass argu
5757
- [`ref readonly`](#ref-readonly-modifier): The argument must be initialized before calling the method. The method can't assign a new value to the parameter.
5858
- [`in`](#in-parameter-modifier): The argument must be initialized before calling the method. The method can't assign a new value to the parameter. The compiler might create a temporary variable to hold a copy of the argument to `in` parameters.
5959

60-
A parameter that is passed by reference is a *reference variable*. It doesn't have it's own value. Instead, it refers to a different variable called its *referrent*. Reference variables can be [ref reassigned](../operators/assignment-operator.md#ref-assignment), which changes its referrent.
60+
A parameter that is passed by reference is a *reference variable*. It doesn't have its own value. Instead, it refers to a different variable called its *referent*. Reference variables can be [ref reassigned](../operators/assignment-operator.md#ref-assignment), which changes its referent.
6161

6262
Members of a class can't have signatures that differ only by `ref`, `ref readonly`, `in`, or `out`. A compiler error occurs if the only difference between two members of a type is that one of them has a `ref` parameter and the other has an `out`, `ref readonly`, or `in` parameter. However, methods can be overloaded when one method has a `ref`, `ref readonly`, `in`, or `out` parameter and the other has a parameter that is passed by value, as shown in the following example. In other situations that require signature matching, such as hiding or overriding, `in`, `ref`, `ref readonly`, and `out` are part of the signature and don't match each other.
6363

docs/csharp/language-reference/operators/assignment-operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In the preceding example, the [local reference variable](../statements/declarati
4343

4444
The left-hand operand of `ref` assignment can be a [local reference variable](../statements/declarations.md#reference-variables), a [`ref` field](../builtin-types/ref-struct.md#ref-fields), and a [`ref`](../keywords/ref.md), [`out`](../keywords/method-parameters.md#out-parameter-modifier), or [`in`](../keywords/method-parameters.md#in-parameter-modifier) method parameter. Both operands must be of the same type.
4545

46-
A `ref` assignment means that a reference variable has a different referrent. It's no longer referring to its previous referrent. Using `ref =` on a `ref` parameter means the parameter no longer refers to its argument. Any actions that modify the state of the object after ref reassigning it make those modifications to the new item. For example, consider the following method:
46+
A `ref` assignment means that a reference variable has a different referent. It's no longer referring to its previous referent. Using `ref =` on a `ref` parameter means the parameter no longer refers to its argument. Any actions that modify the state of the object after ref reassigning it make those modifications to the new item. For example, consider the following method:
4747

4848
:::code language="csharp" source="snippets/shared/AssignmentOperator.cs" id="SnippetRefReassignAndModify":::
4949

docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix/MakeConst/MakeConst.CodeFixes/MakeConst.CodeFixes.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
10+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix/MakeConst/MakeConst.Test/MakeConst.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="3.11.1" />
1313
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
14-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" />
14+
<PackageReference Include="Microsoft.CodeAnalysis" Version="5.0.0" />
1515
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" Version="1.1.2" />

docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix/MakeConst/MakeConst/MakeConst.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

docs/fsharp/language-reference/type-abbreviations.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ ms.date: 05/16/2016
77

88
A *type abbreviation* is an alias or alternate name for a type.
99

10+
> [!NOTE]
11+
> The "type abbreviation" feature allows you to create alternate names that are either shorter or longer than the original type name. It's common to abbreviate long type names or create simpler names for type applications with specific generic arguments. You can use type abbreviations to create longer, more descriptive names that improve code readability.
12+
1013
## Syntax
1114

1215
```fsharp

0 commit comments

Comments
 (0)