Add net 9.0 support (#3171)

* add net 9.0 updates * add net9.x to pipelines * Add public api definitions * remove duplicate package reference * remove nuget errors due to package reference
OData · Jan 31, 2025 · 8fc6c3f · 8fc6c3f
1 parent 54d2da7
commit 8fc6c3f
Show file tree

Hide file tree

Showing 12 changed files with 5,832 additions and 7 deletions.
diff --git 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/buildandtest.yml b/buildandtest.yml
@@ -19,6 +19,9 @@ steps:
 - task: UseDotNet@2
   inputs:
     version: '8.x'
+- task: UseDotNet@2
+  inputs:
+    version: '9.x'
 
 - task: DotNetCoreCLI@2
   displayName: 'Build'  

diff --git 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.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.OData.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.OData.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.OData.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj b/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj
@@ -42,25 +42,23 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Buffers" Version="4.5.1" />
   </ItemGroup>
+
+ <ItemGroup >
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.3" />
+  </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" />

diff --git a/src/Microsoft.OData.Core/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.OData.Core/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.OData.Core/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.OData.Core/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.OData.Edm/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.OData.Edm/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/src/Microsoft.OData.Edm/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.OData.Edm/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/src/Microsoft.Spatial/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.Spatial/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+
diff --git a/src/Microsoft.Spatial/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.Spatial/PublicAPI/net9.0/PublicAPI.Unshipped.txt