Make Sample app actual (#607)

DevExpress · Apr 2, 2024 · 87dd3d8 · 87dd3d8
1 parent 82aba9a
commit 87dd3d8
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 1,137 deletions.
diff --git a/net/Sample/Controllers/HomeController.cs b/net/Sample/Controllers/HomeController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Sample.Controllers {
     public class HomeController : Controller {

diff --git a/net/Sample/Controllers/NorthwindController.cs b/net/Sample/Controllers/NorthwindController.cs
@@ -1,8 +1,6 @@
 using DevExtreme.AspNet.Data;
 
 using Sample.Models;
-using System.Linq;
-using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

diff --git a/net/Sample/DataSourceLoadOptions.cs b/net/Sample/DataSourceLoadOptions.cs
@@ -2,8 +2,6 @@
 using DevExtreme.AspNet.Data.Helpers;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Sample {
 

diff --git a/net/Sample/Extensions.cs b/net/Sample/Extensions.cs
@@ -1,8 +1,4 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Sample {
 

diff --git a/net/Sample/Models/Category.cs b/net/Sample/Models/Category.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {

diff --git a/net/Sample/Models/Customer.cs b/net/Sample/Models/Customer.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {

diff --git a/net/Sample/Models/NorthwindContext.cs b/net/Sample/Models/NorthwindContext.cs
@@ -1,6 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore;
 
 namespace Sample.Models {
 

diff --git a/net/Sample/Models/Order.cs b/net/Sample/Models/Order.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {

diff --git a/net/Sample/Models/OrderDetail.cs b/net/Sample/Models/OrderDetail.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {
 

diff --git a/net/Sample/Models/Product.cs b/net/Sample/Models/Product.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {

diff --git a/net/Sample/Models/Shipper.cs b/net/Sample/Models/Shipper.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Sample.Models {

diff --git a/net/Sample/Program.cs b/net/Sample/Program.cs
@@ -1,23 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
+using Sample.Models;
 
 namespace Sample {
     public class Program {
         public static void Main(string[] args) {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
-                .ConfigureLogging(logging => logging.AddConsole())
-                .Build();
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Services
+                .AddControllersWithViews()
+                .AddRazorRuntimeCompilation();
+            builder.Services
+                .AddLogging()
+                .AddEntityFrameworkSqlServer()
+                .AddDbContext<NorthwindContext>(options => options
+                    //.UseSqlServer("Server=.\\SQLEXPRESS; Database=Northwind; Trusted_Connection=True")
+                    .UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB; Database=Northwind; Integrated Security=True; MultipleActiveResultSets=True; App=EntityFramework")
+                );
 
-            host.Run();
+            var app = builder.Build();
+            app.UseStaticFiles();
+            app.UseRouting();
+            app.MapControllerRoute(
+                name: "default",
+                pattern: "{controller=Home}/{action=Index}/{id?}");
+            app.Run();
         }
     }
 }
diff --git a/net/Sample/Sample.csproj b/net/Sample/Sample.csproj
@@ -2,11 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DevExtreme.AspNet.Data\DevExtreme.AspNet.Data.csproj" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.28" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.28" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.0.96" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>

diff --git a/net/Sample/Startup.cs b/net/Sample/Startup.cs
diff --git a/net/Sample/libman.json b/net/Sample/libman.json
@@ -7,17 +7,17 @@
       "destination": "wwwroot/lib/"
     },
     {
-      "library": "node_modules/devextreme/dist/js/dx.all.debug.js",
+      "library": "node_modules/devextreme-dist/js/dx.all.debug.js",
       "provider": "filesystem",
       "destination": "wwwroot/lib/devextreme/js/"
     },
     {
-      "library": "node_modules/devextreme/dist/css/dx.light.css",
+      "library": "node_modules/devextreme-dist/css/dx.light.css",
       "provider": "filesystem",
       "destination": "wwwroot/lib/devextreme/css/"
     },
     {
-      "library": "node_modules/devextreme/dist/css/icons/",
+      "library": "node_modules/devextreme-dist/css/icons/",
       "provider": "filesystem",
       "destination": "wwwroot/lib/devextreme/css/icons"
     },