From 79f4665ffa4559e9cf4d0884941fc047143b92dc Mon Sep 17 00:00:00 2001
From: Arnaud Boussaer <ABSR@axi.be>
Date: Wed, 16 Jul 2025 16:41:59 +0200
Subject: [PATCH 1/5] Use Odata2Linq nuget for .NET8

---
 dotnet/Directory.Packages.props                        |  1 +
 .../Plugins.StructuredData.EntityFramework.csproj      | 10 ++++++++--
 .../StructuredDataService.cs                           |  4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index c60c6aedd669..3d83244ec117 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.1.0" />
     <PackageVersion Include="OllamaSharp" Version="5.2.3" />
     <PackageVersion Include="OpenAI" Version="[2.2.0-beta.4]" />
     <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..54e33987c7a9 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)' == 'net462'">
+    <PackageReference Include="Community.OData.Linq" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <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..36fd230779db 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 NET462
 using Community.OData.Linq;
+#else
+using OData2Linq;
+#endif
 
 #pragma warning disable CA1308 // Normalize strings to uppercase
 

From a4d30ba1f96d351a285f1de93da7dd10598b2626 Mon Sep 17 00:00:00 2001
From: ArnaudB88 <arnaud_boussaer@msn.com>
Date: Thu, 17 Jul 2025 09:53:45 +0200
Subject: [PATCH 2/5] Update
 dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs

Co-authored-by: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
---
 .../StructuredDataService.cs                                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
index 36fd230779db..a73c5157e829 100644
--- a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
+++ b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-#if NET462
+#if !NET_8_OR_GREATER
 using Community.OData.Linq;
 #else
 using OData2Linq;

From 3e09a4ff62c3f686c06b02114501f0c73b686056 Mon Sep 17 00:00:00 2001
From: Arnaud Boussaer <ABSR@axi.be>
Date: Thu, 17 Jul 2025 10:11:29 +0200
Subject: [PATCH 3/5] fix condition

---
 .../StructuredDataService.cs                                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
index a73c5157e829..408245eb9a8e 100644
--- a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
+++ b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/StructuredDataService.cs
@@ -6,10 +6,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-#if !NET_8_OR_GREATER
-using Community.OData.Linq;
-#else
+#if NET8_0_OR_GREATER
 using OData2Linq;
+#else
+using Community.OData.Linq;
 #endif
 
 #pragma warning disable CA1308 // Normalize strings to uppercase

From dc4aa7a82e9e52d352942547fd0c65eca3111208 Mon Sep 17 00:00:00 2001
From: Arnaud Boussaer <ABSR@axi.be>
Date: Thu, 17 Jul 2025 13:29:51 +0200
Subject: [PATCH 4/5] update version

---
 dotnet/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index 3d83244ec117..0c3e8bce3dce 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -69,7 +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.1.0" />
+    <PackageVersion Include="OData2Linq" Version="2.2.0" />
     <PackageVersion Include="OllamaSharp" Version="5.2.3" />
     <PackageVersion Include="OpenAI" Version="[2.2.0-beta.4]" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />

From d2125b2e80b829ba78e7efd85dbc891ad83573db Mon Sep 17 00:00:00 2001
From: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:15:55 +0100
Subject: [PATCH 5/5] Update
 dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj

---
 .../Plugins.StructuredData.EntityFramework.csproj             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 54e33987c7a9..5f256b507dc8 100644
--- a/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj
+++ b/dotnet/src/Plugins/Plugins.StructuredData.EntityFramework/Plugins.StructuredData.EntityFramework.csproj
@@ -39,10 +39,10 @@
     <PackageReference Include="EntityFramework" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'">
     <PackageReference Include="Community.OData.Linq" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'">
     <PackageReference Include="OData2Linq" />
   </ItemGroup>