Skip to content

Commit 7e76ae5

Browse files
Update to 25.1.2+
1 parent 95f681e commit 7e76ae5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+18889
-42025
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ jobs:
7373
uses: actions/checkout@v3
7474

7575
- name: Use Node.js
76-
uses: actions/setup-node@v3
76+
uses: actions/setup-node@v4
77+
with:
78+
node-version: '20'
7779

7880
- name: Restore npm cache
7981
uses: actions/cache@v3

.github/workflows/typescript.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ jobs:
4444
uses: actions/checkout@v3
4545

4646
- name: Use Node.js
47-
uses: actions/setup-node@v3
47+
uses: actions/setup-node@v4
48+
with:
49+
node-version: '20'
4850

4951
- name: Restore npm cache
5052
uses: actions/cache@v3

.gitignore

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
x64/
2121
x86/
2222
bld/
23+
[Bb]in/
2324
[Oo]bj/
2425
[Ll]og/
2526

@@ -60,6 +61,7 @@ artifacts/
6061
*.pdb
6162
*.pgc
6263
*.pgd
64+
*.rsp
6365
*.sbr
6466
*.tlb
6567
*.tli
@@ -83,7 +85,7 @@ ipch/
8385
*.ncb
8486
*.opendb
8587
*.opensdf
86-
#*.sdf
88+
*.sdf
8789
*.cachefile
8890
*.VC.db
8991
*.VC.VC.opendb
@@ -223,9 +225,9 @@ UpgradeLog*.XML
223225
UpgradeLog*.htm
224226

225227
# SQL Server files
226-
#*.mdf
227-
#*.ldf
228-
#*.ndf
228+
*.mdf
229+
*.ldf
230+
*.ndf
229231

230232
# Business Intelligence projects
231233
*.rdl.data
@@ -296,5 +298,8 @@ __pycache__/
296298
*.odx.cs
297299
*.xsd.cs
298300

299-
#Angular Files
300-
.angular/cache/
301+
#ExampleRangeTester artifacts
302+
TesterMetadata.xml
303+
304+
# Backup files
305+
*.bak

ASP.NET Core/ASP.NET Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</Exec>
1919
</Target>
2020
<ItemGroup>
21-
<PackageReference Include="DevExtreme.AspNet.Data" Version="4.*" />
22-
<PackageReference Include="DevExtreme.AspNet.Core" Version="24.1.*" />
21+
<PackageReference Include="DevExtreme.AspNet.Data" Version="5.*" />
22+
<PackageReference Include="DevExtreme.AspNet.Core" Version="24.2.*" />
2323
</ItemGroup>
2424

2525
<ProjectExtensions>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Net;
5+
using System.Net.Http;
6+
using ASP_NET_Core.Models;
7+
using DevExtreme.AspNet.Data;
8+
using DevExtreme.AspNet.Mvc;
9+
using Microsoft.AspNetCore.Mvc;
10+
11+
namespace ASP_NET_Core.Controllers {
12+
13+
[Route("api/[controller]")]
14+
public class SampleDataController : Controller {
15+
16+
[HttpGet]
17+
public object Get(DataSourceLoadOptions loadOptions) {
18+
return DataSourceLoader.Load(SampleData.Orders, loadOptions);
19+
}
20+
21+
}
22+
}

0 commit comments

Comments
 (0)