From aa5906038d6014687afb54b8e57540e6669dc5f5 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 30 Sep 2026 09:46:58 -0500
Subject: [PATCH 1/2] Update and consolidate MongoDB dependencies

Use MongoDB.Driver 3.12.0 across target frameworks, update the EF Core providers, and remove redundant Snappier references from the v3 integrations.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Directory.Packages.props                                   | 7 +++----
 .../Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj     | 4 ----
 .../Aspire.MongoDB.EntityFrameworkCore.csproj              | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4c69072792c..4dc4dadfa9b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -140,7 +140,7 @@
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="5.0.0" />
     <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" /> <!-- No stable release available -->
     <PackageVersion Include="ModelContextProtocol" Version="1.4.1" />
-    <PackageVersion Include="MongoDB.Driver" Version="3.9.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="3.12.0" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="3.0.0" />
     <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.6.2" />
     <PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
@@ -262,7 +262,7 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignLTSVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerLTSVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsLTSVersion)" />
-    <PackageVersion Include="MongoDB.EntityFrameworkCore" Version="8.4.1" />
+    <PackageVersion Include="MongoDB.EntityFrameworkCore" Version="8.4.4" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
     <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.26200" />
     <!-- ASP.NET Core -->
@@ -285,8 +285,7 @@
     <PackageVersion Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />
     <PackageVersion Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion)" />
     <PackageVersion Update="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsVersion)" />
-    <PackageVersion Update="MongoDB.Driver" Version="3.3.0" />
-    <PackageVersion Update="MongoDB.EntityFrameworkCore" Version="9.0.0" />
+    <PackageVersion Update="MongoDB.EntityFrameworkCore" Version="9.1.4" />
     <PackageVersion Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
     <PackageVersion Update="Oracle.EntityFrameworkCore" Version="9.23.26000" />
     <!-- ASP.NET Core -->
diff --git a/src/Components/Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj b/src/Components/Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj
index f8743f4be16..3172ecff324 100644
--- a/src/Components/Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj
+++ b/src/Components/Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj
@@ -26,10 +26,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-    <!-- Older MongoDB.Driver versions permit Snappier >= 1.0.0. Require the patched
-         version for consumers without changing the framework-specific driver versions.
-         https://github.com/advisories/GHSA-pggp-6c3x-2xmx -->
-    <PackageReference Include="Snappier" VersionOverride="1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj b/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
index d258d0de081..8c54c511d0b 100644
--- a/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
+++ b/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
@@ -29,10 +29,6 @@
     <PackageReference Include="Polly.Extensions" />
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-    <!-- Older MongoDB.Driver versions permit Snappier >= 1.0.0. Require the patched
-         version for consumers without changing the framework-specific provider versions.
-         https://github.com/advisories/GHSA-pggp-6c3x-2xmx -->
-    <PackageReference Include="Snappier" VersionOverride="1.3.1" />
   </ItemGroup>
 
 </Project>

From 335a5f89e93758e69ca54523336012c3f8dc6cef Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 30 Sep 2026 10:01:58 -0500
Subject: [PATCH 2/2] Add net10 MongoDb.EntityFrameworkCore target framework

---
 Directory.Packages.props                                       | 2 +-
 .../Aspire.MongoDB.EntityFrameworkCore.csproj                  | 3 +--
 .../Aspire.MongoDB.EntityFrameworkCore.Tests.csproj            | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4dc4dadfa9b..b8f3e797f36 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -307,7 +307,7 @@
     <PackageVersion Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPreviewVersion)" />
     <PackageVersion Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPreviewVersion)" />
     <PackageVersion Update="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPreviewVersion)" />
-    <!-- MongoDB.EntityFrameworkCore does not support EF Core 10 yet, so no version override here -->
+    <PackageVersion Update="MongoDB.EntityFrameworkCore" Version="10.0.4" />
     <PackageVersion Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
     <PackageVersion Update="Oracle.EntityFrameworkCore" Version="10.23.26000" />
     <!-- ASP.NET Core -->
diff --git a/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj b/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
index 8c54c511d0b..2088554cc31 100644
--- a/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
+++ b/src/Components/Aspire.MongoDB.EntityFrameworkCore/Aspire.MongoDB.EntityFrameworkCore.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- MongoDB.EntityFrameworkCore does not support EF Core 10 yet, so only target net8.0 and net9.0 -->
-    <TargetFrameworks>$(DefaultTargetFramework);net9.0</TargetFrameworks>
+    <TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <PackageTags>$(ComponentEfCorePackageTags)  MongoDB</PackageTags>
     <PackageIconFullPath>$(SharedDir)MongoDB_300px.png</PackageIconFullPath>
diff --git a/tests/Aspire.MongoDB.EntityFrameworkCore.Tests/Aspire.MongoDB.EntityFrameworkCore.Tests.csproj b/tests/Aspire.MongoDB.EntityFrameworkCore.Tests/Aspire.MongoDB.EntityFrameworkCore.Tests.csproj
index 12f2e83012c..613f93a6a42 100644
--- a/tests/Aspire.MongoDB.EntityFrameworkCore.Tests/Aspire.MongoDB.EntityFrameworkCore.Tests.csproj
+++ b/tests/Aspire.MongoDB.EntityFrameworkCore.Tests/Aspire.MongoDB.EntityFrameworkCore.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- MongoDB.EntityFrameworkCore does not support EF Core 10 yet, so only target net8.0 and net9.0 -->
-    <TargetFrameworks>$(DefaultTargetFramework);net9.0</TargetFrameworks>
+    <TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
     <!-- MongoDB.Driver.Core.Extensions.DiagnosticSources and AspNetCore.HealthChecks.MongoDb packages are not signed -->
     <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>