Skip to content

Commit 791e6ba

Browse files
Merge pull request #44065 from dotnet/main
Merge main into live
2 parents 6d25c7b + 38c5145 commit 791e6ba

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
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&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/) |
313313
| Resource Management - Recovery Services Site Recovery | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesSiteRecovery/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesSiteRecovery-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesSiteRecovery_1.2.0/sdk/recoveryservices-siterecovery/Azure.ResourceManager.RecoveryServicesSiteRecovery/) |
314-
| Resource Management - Redis | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.Redis/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Redis-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Redis_1.4.0/sdk/redis/Azure.ResourceManager.Redis/) |
314+
| Resource Management - Redis | NuGet [1.5.0](https://www.nuget.org/packages/Azure.ResourceManager.Redis/1.5.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Redis-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Redis_1.5.0/sdk/redis/Azure.ResourceManager.Redis/) |
315315
| Resource Management - Redis Enterprise | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterprise/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterprise/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RedisEnterprise-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RedisEnterprise_1.1.0/sdk/redisenterprise/Azure.ResourceManager.RedisEnterprise/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RedisEnterprise_1.2.0-beta.1/sdk/redisenterprise/Azure.ResourceManager.RedisEnterprise/) |
316316
| Resource Management - Redis Enterprise Cache | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterpriseCache/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RedisEnterpriseCache-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.RedisEnterpriseCache_1.0.0-beta.1/sdk/redisenterprise/Azure.ResourceManager.RedisEnterpriseCache/) |
317317
| Resource Management - Relay | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Relay/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Relay-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Relay_1.2.0/sdk/relay/Azure.ResourceManager.Relay/) |
@@ -525,7 +525,7 @@
525525
| Microsoft.Azure.Functions.Worker.Extensions.Abstractions | NuGet [1.3.0](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.Abstractions/1.3.0) | | |
526526
| Microsoft.Azure.Functions.Worker.Extensions.ApplicationInsights | NuGet [1.0.0-preview4](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.ApplicationInsights/1.0.0-preview4) | | |
527527
| Microsoft.Azure.Functions.Worker.Extensions.CosmosDB | NuGet [4.11.0](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.CosmosDB/4.11.0) | | |
528-
| Microsoft.Azure.Functions.Worker.Extensions.EventGrid | NuGet [3.4.2](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.EventGrid/3.4.2) | | |
528+
| Microsoft.Azure.Functions.Worker.Extensions.EventGrid | NuGet [3.4.3](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.EventGrid/3.4.3) | | |
529529
| Microsoft.Azure.Functions.Worker.Extensions.EventHubs | NuGet [6.3.6](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.EventHubs/6.3.6) | | |
530530
| Microsoft.Azure.Functions.Worker.Extensions.Http | NuGet [3.2.0](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.Http/3.2.0) | | |
531531
| Microsoft.Azure.Functions.Worker.Extensions.Kafka | NuGet [4.0.0](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Extensions.Kafka/4.0.0) | | |

docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
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/) |
320320
| Resource Management - Recovery Services Site Recovery | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.RecoveryServicesSiteRecovery/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.RecoveryServicesSiteRecovery-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RecoveryServicesSiteRecovery_1.2.0/sdk/recoveryservices-siterecovery/Azure.ResourceManager.RecoveryServicesSiteRecovery/) |
321-
| Resource Management - Redis | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.Redis/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Redis-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Redis_1.4.0/sdk/redis/Azure.ResourceManager.Redis/) |
321+
| Resource Management - Redis | NuGet [1.5.0](https://www.nuget.org/packages/Azure.ResourceManager.Redis/1.5.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Redis-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Redis_1.5.0/sdk/redis/Azure.ResourceManager.Redis/) |
322322
| Resource Management - Redis Enterprise | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterprise/1.1.0)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterprise/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RedisEnterprise-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RedisEnterprise_1.1.0/sdk/redisenterprise/Azure.ResourceManager.RedisEnterprise/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.RedisEnterprise_1.2.0-beta.1/sdk/redisenterprise/Azure.ResourceManager.RedisEnterprise/) |
323323
| Resource Management - Redis Enterprise Cache | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.RedisEnterpriseCache/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.RedisEnterpriseCache-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.RedisEnterpriseCache_1.0.0-beta.1/sdk/redisenterprise/Azure.ResourceManager.RedisEnterpriseCache/) |
324324
| Resource Management - Relay | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Relay/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Relay-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Relay_1.2.0/sdk/relay/Azure.ResourceManager.Relay/) |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ A test context property is not following single or multiple points of the requir
3636
`TestContext` properties should follow the given layout to be considered valid by MSTest:
3737

3838
- they should be properties and not fields
39-
- they should be named `TestContext` (case insensitive)
39+
- they should be named `TestContext` (case sensitive)
4040
- they should be `public` (or `internal` if the `[assembly: DiscoverInternals]` assembly attribute is set)
4141
- they should not be `static`
4242
- they should not be readonly

docs/core/tools/dotnet-add-reference.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ The `dotnet add reference` command provides a convenient option to add project r
2929
<ProjectReference Include="app.csproj" />
3030
<ProjectReference Include="..\lib2\lib2.csproj" />
3131
<ProjectReference Include="..\lib1\lib1.csproj" />
32+
<ProjectReference Include="..\lib3\lib3.fsproj" />
3233
</ItemGroup>
3334
```
3435

@@ -72,6 +73,12 @@ There's no CLI command to add a reference to an assembly that isn't in a project
7273
dotnet add app/app.csproj reference lib/lib.csproj
7374
```
7475

76+
- Add a compatible .NET language (for example, F#) project reference, which works in both directions:
77+
78+
```dotnetcli
79+
dotnet add app/app.csproj reference lib/lib.fsproj
80+
```
81+
7582
- Add multiple project references to the project in the current directory:
7683

7784
```dotnetcli

samples/snippets/standard/data/sqlite/HelloWorldSample/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ FROM user
7979
#endregion
8080

8181
// Clean up
82+
SqliteConnection.ClearAllPools();
8283
File.Delete("hello.db");
8384
}
8485
}

0 commit comments

Comments
 (0)