Convert the example to 25.1

CS/ODataService/Controllers/ActionsController.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Routing;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
+using Microsoft.AspNetCore.OData.Routing.Attributes;
 using ODataService.Helpers;
 using ODataService.Models;
 
@@ -16,15 +13,15 @@ public class ActionsController : ODataController {
         public ActionsController(UnitOfWork uow) {
             this.Session = uow;
         }
-        [ODataRoute("InitializeDatabase")]
+        [Route("odata/InitializeDatabase")]
         public IActionResult InitializeDatabase() {
             DemoDataHelper.CleanupDatabase(Session);
             DemoDataHelper.CreateDemoData(Session);
             return Ok();
         }
 
         [HttpGet]
-        [ODataRoute("TotalSalesByYear(year={year})")]
+        [Route("odata/TotalSalesByYear(year={year})")]
         public IActionResult TotalSalesByYear(int year) {
             decimal result = Session.Query<Order>()
                     .Where(o => o.Date.Value.Year == year)

CS/ODataService/Controllers/ContractController.cs

@@ -1,8 +1,12 @@
 using System;
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 

CS/ODataService/Controllers/CustomerController.cs

@@ -1,8 +1,12 @@
 using System;
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 

CS/ODataService/Controllers/DocumentsController.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 

CS/ODataService/Controllers/OrderController.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Routing;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 
@@ -100,7 +103,7 @@ public IActionResult Patch([FromODataUri] int key, Delta<Order> order) {
 
         [HttpPost]
         [HttpPut]
-        [ODataRoute("Order({key})/OrderDetails")]
+        [Route("Order({key})/OrderDetails")]
         public IActionResult AddToOrderDetails([FromODataUri] int key, OrderDetail orderDetail) {
             Order order = Session.GetObjectByKey<Order>(key);
             if(order == null) {

CS/ODataService/Controllers/OrderDetailController.cs

@@ -1,7 +1,11 @@
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 

CS/ODataService/Controllers/ProductController.cs

@@ -1,8 +1,12 @@
 using System;
 using System.Linq;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Deltas;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Results;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 using ODataService.Helpers;
 using ODataService.Models;
 

CS/ODataService/Helpers/ApiHelper.cs

@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Net;
 using DevExpress.Xpo;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.OData.Deltas;
 
 namespace ODataService.Helpers {
     public static class ApiHelper {

CS/ODataService/Helpers/UriHelper.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Extensions;
-using Microsoft.AspNet.OData.Routing;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.OData.UriParser;
 using ODataService.Models;
 

CS/ODataService/Models/SingletonEdmModel.cs

@@ -1,11 +1,9 @@
 using DevExpress.Data.Filtering;
 using DevExpress.Xpo;
 using DevExpress.Xpo.Metadata;
-using Microsoft.AspNet.OData.Builder;
 using Microsoft.OData.Edm;
+using Microsoft.OData.ModelBuilder;
 using ODataService.Helpers;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace ODataService.Models {

CS/ODataService/ODataService.csproj

@@ -3,12 +3,12 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DevExpress.Xpo" Version="24.2.6" />
-    <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.7.8" />
+    <PackageReference Include="DevExpress.Xpo" Version="25.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.3.2" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
   </ItemGroup>
 </Project>

CS/ODataService/Startup.cs

@@ -1,17 +1,16 @@
-using System;
-using System.Linq;
-using DevExpress.Xpo.DB;
-using Microsoft.AspNet.OData.Batch;
-using Microsoft.AspNet.OData.Extensions;
+using DevExpress.Xpo.DB;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.OData;
+using Microsoft.AspNetCore.OData.Batch;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using ODataService.Helpers;
 using ODataService.Models;
+using System;
+using System.Linq;
 
 namespace ODataService
 {
@@ -27,12 +26,15 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddOData();
-            services.AddODataQueryFilter();
-            services.AddMvc(options => {
-                options.EnableEndpointRouting = false;
-                options.ModelValidatorProviders.Clear();
-            });
+            services.AddControllers()
+                .AddOData(opt => opt
+                    .Select()
+                    .Filter()
+                    .OrderBy()
+                    .Expand()
+                    .Count()
+                    .SetMaxTop(null)
+                    .AddRouteComponents("odata", SingletonEdmModel.GetEdmModel()));
 
             services.AddSingleton<IObjectModelValidator, CustomModelValidator>();
 
@@ -50,12 +52,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseODataBatching();
+            app.UseRouting();
 
-            app.UseMvc(b =>
+            app.UseEndpoints(endpoints =>
             {
-                b.Count().Filter().OrderBy().Expand().Select().MaxTop(null);
-                b.MapODataServiceRoute("odata", "odata", SingletonEdmModel.GetEdmModel(), new DefaultODataBatchHandler());
+                endpoints.MapControllers();
             });
         }
     }