Skip to content

Make Sample app actual #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpreyskurantov merged 3 commits into from
Apr 2, 2024
Merged

Make Sample app actual #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aad971
NET6 single Program.cs (instead of legacy) + clean up usings
mpreyskurantov Apr 2, 2024
62667d0
RazorRuntimeCompilation (for hot reload) + bump to latest patch
mpreyskurantov Apr 2, 2024
738f11a
Migrate to latest devextreme-dist (vs dist) + jQuery
mpreyskurantov Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions net/Sample/Controllers/HomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions net/Sample/Controllers/NorthwindController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions net/Sample/DataSourceLoadOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 0 additions & 4 deletions net/Sample/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

namespace Sample {

Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/Category.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/Customer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/NorthwindContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore;

namespace Sample.Models {

Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/Order.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions net/Sample/Models/OrderDetail.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/Product.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Models/Shipper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
35 changes: 20 additions & 15 deletions net/Sample/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Comment thread
mpreyskurantov marked this conversation as resolved.
.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();
}
}
}
4 changes: 3 additions & 1 deletion net/Sample/Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
34 changes: 0 additions & 34 deletions net/Sample/Startup.cs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions net/Sample/libman.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Loading