Merge pull request #1767 from dotnet/main

✅ Merge `main` into `live`
dotnet · Oct 8, 2024 · f0daaee · f0daaee
2 parents 48f6051 + 4e4a532
commit f0daaee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/database/postgresql-entity-framework-integration.md b/docs/database/postgresql-entity-framework-integration.md
@@ -178,7 +178,7 @@ Here are the configurable options with corresponding default values:
 
 | Name | Description |
 |-----------------------|--------------------------------------------------------------------------------------------------------|
-| `ConnectionString` | The connection string of the SQL Server database to connect to. |
+| `ConnectionString` | The connection string of the PostgreSQL database to connect to. |
 | `MaxRetryCount` | The maximum number of retry attempts. Default value is 6, set it to 0 to disable the retry mechanism. |
 | `DisableHealthChecks` | A boolean value that indicates whether the database health check is disabled or not. |
 | `DisableTracing` | A boolean value that indicates whether the OpenTelemetry tracing is disabled or not. |

diff --git a/docs/extensibility/snippets/MailDevResourceAndComponent/MailKit.Client/MailKit.Client.csproj b/docs/extensibility/snippets/MailDevResourceAndComponent/MailKit.Client/MailKit.Client.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="MailKit" Version="4.7.1.1" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.2.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
  <PackageReference Include="Microsoft.Extensions.Resilience" Version="8.7.0" />
  <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.7" />