diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index 22779c89ef7c..9081192d7dd7 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -69,6 +69,7 @@
     <PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Npgsql" Version="8.0.7" />
+    <PackageVersion Include="OData2Linq" Version="2.2.0" />
     <PackageVersion Include="OllamaSharp" Version="5.2.3" />
     <PackageVersion Include="OpenAI" Version="[2.2.0]" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
diff --git a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj
index e71beb95f95e..5f256b507dc8 100644
--- a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj
+++ b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Compile Remove="$(RepoRoot)/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs" Link="%(RecursiveDir)/InternalUtilities/Diagnostics/%(Filename)%(Extension)"/>
+    <Compile Remove="$(RepoRoot)/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs" Link="%(RecursiveDir)/InternalUtilities/Diagnostics/%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,8 +36,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Community.OData.Linq" />
     <PackageReference Include="EntityFramework" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'">
+    <PackageReference Include="Community.OData.Linq" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="OData2Linq" />
+  </ItemGroup>
+
 </Project>
diff --git a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
index 2bf63e049eef..408245eb9a8e 100644
--- a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
+++ b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
@@ -6,7 +6,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+#if NET8_0_OR_GREATER
+using OData2Linq;
+#else
 using Community.OData.Linq;
+#endif
 
 #pragma warning disable CA1308 // Normalize strings to uppercase