Add support for odata v9

dotnet · Sep 2, 2024 · 705fc03 · 705fc03
1 parent 3fc0719
commit 705fc03
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/examples/AspNetCore/OData/Directory.Build.props b/examples/AspNetCore/OData/Directory.Build.props
@@ -4,7 +4,7 @@
  <Import Project="$([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)','$(MSBuildThisFileDirectory)../'))" />
 
  <ItemGroup>
-  <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.3" />
+  <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.0.0" />
  </ItemGroup>
 
 </Project>
diff --git a/src/Abstractions/src/Asp.Versioning.Abstractions/Asp.Versioning.Abstractions.csproj b/src/Abstractions/src/Asp.Versioning.Abstractions/Asp.Versioning.Abstractions.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFrameworks>$(DefaultTargetFramework);netstandard1.0;netstandard2.0</TargetFrameworks>
   <AssemblyTitle>API Versioning Abstractions</AssemblyTitle>
   <Description>The abstractions library for API versioning.</Description>

diff --git a/...ore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiDescriptionProvider.cs b/...ore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiDescriptionProvider.cs
@@ -171,7 +171,7 @@ protected virtual void ExploreQueryOptions( IEnumerable<ApiDescription> apiDescr
         {
             NoDollarPrefix = localODataOptions.EnableNoDollarQueryOptions,
             DescriptionProvider = localQueryOptions.DescriptionProvider,
-            DefaultQuerySettings = localODataOptions.QuerySettings,
+            DefaultQuerySettings = localODataOptions.QueryConfigurations,
             ModelMetadataProvider = ModelMetadataProvider,
         };
 
@@ -309,10 +309,10 @@ private void ExpandNavigationPropertyLinks(
             switch ( template[i] )
             {
                 case EntitySetSegmentTemplate segment:
-                    entity = segment.EntitySet.EntityType();
+                    entity = segment.EntitySet.EntityType;
                     break;
                 case SingletonSegmentTemplate segment:
-                    entity = segment.Singleton.EntityType();
+                    entity = segment.Singleton.EntityType;
                     break;
             }
         }

diff --git a/...etCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj b/...etCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning API Explorer for OData v4.0</AssemblyTitle>

diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj b/src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning with OData v4.0</AssemblyTitle>
@@ -15,7 +15,7 @@
  </ItemGroup>
 
  <ItemGroup>
-  <PackageReference Include="Microsoft.AspNetCore.OData" Version="[8.0.2,9.0.0)" />
+  <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/AspNetCore/WebApi/src/Asp.Versioning.Http/Asp.Versioning.Http.csproj b/src/AspNetCore/WebApi/src/Asp.Versioning.Http/Asp.Versioning.Http.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning</AssemblyTitle>

diff --git a/...spNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/Asp.Versioning.Mvc.ApiExplorer.csproj b/...spNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/Asp.Versioning.Mvc.ApiExplorer.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning.ApiExplorer</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning API Explorer</AssemblyTitle>

diff --git a/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/Asp.Versioning.Mvc.csproj b/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/Asp.Versioning.Mvc.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning</AssemblyTitle>

diff --git a/src/Client/src/Asp.Versioning.Http.Client/Asp.Versioning.Http.Client.csproj b/src/Client/src/Asp.Versioning.Http.Client/Asp.Versioning.Http.Client.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>9.0.0</VersionPrefix>
+  <AssemblyVersion>9.0.0.0</AssemblyVersion>
   <TargetFrameworks>$(DefaultTargetFramework);netstandard1.1;netstandard2.0</TargetFrameworks>
   <RootNamespace>Asp.Versioning.Http</RootNamespace>
   <AssemblyTitle>API Versioning Client Extensions</AssemblyTitle>