From 46cb1cf86892a0587f8be6bc04172deb70770723 Mon Sep 17 00:00:00 2001
From: David Wambugu <dawambug@microsoft.com>
Date: Thu, 23 Jan 2025 10:12:47 +0300
Subject: [PATCH] add net 9.0 updates

---
 Build.props                                      |  3 +++
 .../Microsoft.OData.Client.csproj                |  1 +
 .../Microsoft.OData.Core.csproj                  | 16 ++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Build.props b/Build.props
index 1ffa973e5e..f7c0612aeb 100644
--- a/Build.props
+++ b/Build.props
@@ -44,6 +44,9 @@
     <DefineConstants>$(DefineConstants);SUPPRESS_SECURITY_RULES;</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup>
+      <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
 
   <PropertyGroup Condition ="'$(TargetFrameworkIdentifier)' == 'net45'">
     <DefineConstants>$(DefineConstants);SUPPRESS_SECURITY_RULES;</DefineConstants>
diff --git a/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj b/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
index d68b300ebe..0f5f444564 100644
--- a/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
+++ b/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
@@ -125,6 +125,7 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.Security.Permissions" Version="9.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
diff --git a/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj b/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj
index 75da138d26..a77bcf2536 100644
--- a/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj
+++ b/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj
@@ -50,17 +50,21 @@
     <PackageReference Include="System.Buffers" Version="4.5.1" />
   </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool"  Version="9.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj" />
     <ProjectReference Include="..\Microsoft.Spatial\Microsoft.Spatial.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	<PackageReference Include="Microsoft.Extensions.ObjectPool">
-	  <Version>6.0.3</Version>
-	</PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />