Skip to content

Commit 9e259f4

Browse files
AlisherAmonulloevAlisherAmonulloev
committed
update to 25.1.2+
1 parent 8659a82 commit 9e259f4

Some content is hidden

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

63 files changed

+32031
-51193
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
name: Lint
2+
3+
concurrency:
4+
group: wf-${{github.event.pull_request.number || github.sha}}-${{github.workflow}}
5+
cancel-in-progress: true
6+
7+
on:
8+
pull_request:
9+
push:
10+
branches:
11+
- "[0-9][0-9].[0-9].[0-9]*"
12+
13+
jobs:
14+
Angular:
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 60
17+
steps:
18+
- name: Get sources
19+
uses: actions/checkout@v3
20+
21+
- name: Use Node.js
22+
uses: actions/setup-node@v3
23+
24+
- name: Restore npm cache
25+
uses: actions/cache@v3
26+
with:
27+
path: ./Angular/node_modules
28+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
29+
restore-keys: ${{ runner.os }}-node-modules
30+
31+
- name: Run npm install
32+
working-directory: Angular
33+
run: npm install --no-audit --no-fund
34+
35+
- name: Lint Angular
36+
working-directory: Angular
37+
env:
38+
DEBUG: eslint:cli-engine
39+
run: npm run lint
40+
41+
jQuery:
42+
runs-on: ubuntu-latest
43+
timeout-minutes: 60
44+
steps:
45+
- name: Get sources
46+
uses: actions/checkout@v3
47+
48+
- name: Use Node.js
49+
uses: actions/setup-node@v3
50+
51+
- name: Restore npm cache
52+
uses: actions/cache@v3
53+
with:
54+
path: ./jQuery/node_modules
55+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
56+
restore-keys: ${{ runner.os }}-node-modules
57+
58+
- name: Run npm install
59+
working-directory: jQuery
60+
run: npm install --no-audit --no-fund
61+
62+
- name: Lint jQuery
63+
working-directory: jQuery
64+
env:
65+
DEBUG: eslint:cli-engine
66+
run: npm run lint
67+
68+
React:
69+
runs-on: ubuntu-latest
70+
timeout-minutes: 60
71+
steps:
72+
- name: Get sources
73+
uses: actions/checkout@v3
74+
75+
- name: Use Node.js
76+
uses: actions/setup-node@v4
77+
with:
78+
node-version: '20'
79+
80+
- name: Restore npm cache
81+
uses: actions/cache@v3
82+
with:
83+
path: ./React/node_modules
84+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
85+
restore-keys: ${{ runner.os }}-node-modules
86+
87+
- name: Run npm install
88+
working-directory: React
89+
run: npm install --no-audit --no-fund
90+
91+
- name: Lint React
92+
working-directory: React
93+
env:
94+
DEBUG: eslint:cli-engine
95+
run: npm run lint
96+
97+
Vue:
98+
runs-on: ubuntu-latest
99+
timeout-minutes: 60
100+
steps:
101+
- name: Get sources
102+
uses: actions/checkout@v3
103+
104+
- name: Use Node.js
105+
uses: actions/setup-node@v3
106+
107+
- name: Restore npm cache
108+
uses: actions/cache@v3
109+
with:
110+
path: ./Vue/node_modules
111+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
112+
restore-keys: ${{ runner.os }}-node-modules
113+
114+
- name: Run npm install
115+
working-directory: Vue
116+
run: npm install --no-audit --no-fund
117+
118+
- name: Lint Vue
119+
working-directory: Vue
120+
env:
121+
DEBUG: eslint:cli-engine
122+
run: npm run lint

‎.github/workflows/typescript.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: TS compilation
2+
3+
concurrency:
4+
group: wf-${{github.event.pull_request.number || github.sha}}-${{github.workflow}}
5+
cancel-in-progress: true
6+
7+
on:
8+
pull_request:
9+
push:
10+
branches:
11+
- "[0-9][0-9].[0-9].[0-9]*"
12+
13+
jobs:
14+
Angular:
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 60
17+
steps:
18+
- name: Get sources
19+
uses: actions/checkout@v3
20+
21+
- name: Use Node.js
22+
uses: actions/setup-node@v3
23+
24+
- name: Restore npm cache
25+
uses: actions/cache@v3
26+
with:
27+
path: ./Angular/node_modules
28+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
29+
restore-keys: ${{ runner.os }}-node-modules
30+
31+
- name: Run npm install
32+
working-directory: Angular
33+
run: npm install --no-audit --no-fund
34+
35+
- name: TSC Angular
36+
working-directory: Angular
37+
run: npm run build
38+
39+
React:
40+
runs-on: ubuntu-latest
41+
timeout-minutes: 60
42+
steps:
43+
- name: Get sources
44+
uses: actions/checkout@v3
45+
46+
- name: Use Node.js
47+
uses: actions/setup-node@v4
48+
with:
49+
node-version: '20'
50+
51+
- name: Restore npm cache
52+
uses: actions/cache@v3
53+
with:
54+
path: ./React/node_modules
55+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
56+
restore-keys: ${{ runner.os }}-node-modules
57+
58+
- name: Run npm install
59+
working-directory: React
60+
run: npm install --no-audit --no-fund
61+
62+
- name: TSC React
63+
working-directory: React
64+
run: npm run build
65+
66+
Vue:
67+
runs-on: ubuntu-latest
68+
timeout-minutes: 60
69+
steps:
70+
- name: Get sources
71+
uses: actions/checkout@v3
72+
73+
- name: Use Node.js
74+
uses: actions/setup-node@v3
75+
76+
- name: Restore npm cache
77+
uses: actions/cache@v3
78+
with:
79+
path: ./Vue/node_modules
80+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
81+
restore-keys: ${{ runner.os }}-node-modules
82+
83+
- name: Run npm install
84+
working-directory: Vue
85+
run: npm install --no-audit --no-fund
86+
87+
- name: TSC Vue
88+
working-directory: Vue
89+
run: npm run type-check

‎ASP.NET Core/ASP.NET Core.csproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
</PropertyGroup>
6-
<Target Name="DebugEnsureNodeEnv" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
7-
<!-- Ensure Node.js is installed -->
8-
<Exec Command="node --version" ContinueOnError="true">
9-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
10-
</Exec>
11-
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
12-
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
13-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
14-
</Target>
15-
<Target Name="RunGulp" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And Exists('$(SpaRoot)node_modules') ">
16-
<Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp add-resources" ContinueOnError="false">
17-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
18-
</Exec>
19-
</Target>
20-
<ItemGroup>
21-
<PackageReference Include="DevExtreme.AspNet.Data" Version="4.*" />
22-
<PackageReference Include="DevExtreme.AspNet.Core" Version="24.1.*" />
23-
</ItemGroup>
24-
25-
<ProjectExtensions>
26-
<VisualStudio>
27-
<UserProperties TemplateFeatures="NETCORE" />
28-
</VisualStudio>
29-
</ProjectExtensions>
30-
31-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
</PropertyGroup>
6+
<Target Name="DebugEnsureNodeEnv" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
7+
<!-- Ensure Node.js is installed -->
8+
<Exec Command="node --version" ContinueOnError="true">
9+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
10+
</Exec>
11+
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
12+
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
13+
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
14+
</Target>
15+
<Target Name="RunGulp" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And Exists('$(SpaRoot)node_modules') ">
16+
<Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp add-resources" ContinueOnError="false">
17+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
18+
</Exec>
19+
</Target>
20+
<ItemGroup>
21+
<PackageReference Include="DevExtreme.AspNet.Data" Version="5.*" />
22+
<PackageReference Include="DevExtreme.AspNet.Core" Version="24.2.*" />
23+
</ItemGroup>
24+
25+
<ProjectExtensions>
26+
<VisualStudio>
27+
<UserProperties TemplateFeatures="NETCORE" />
28+
</VisualStudio>
29+
</ProjectExtensions>
30+
31+
</Project>

‎ASP.NET Core/appsettings.Development.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
7-
}
8-
}
9-
}
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft": "Warning",
6+
"Microsoft.Hosting.Lifetime": "Information"
7+
}
8+
}
9+
}

‎ASP.NET Core/appsettings.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
7-
}
8-
},
9-
"AllowedHosts": "*"
10-
}
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information",
5+
"Microsoft": "Warning",
6+
"Microsoft.Hosting.Lifetime": "Information"
7+
}
8+
},
9+
"AllowedHosts": "*"
10+
}

‎ASP.NET Core/gulpfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ let defaultScripts = [
3535

3636
let dxtStyles = [
3737
"node_modules/bootstrap/dist/css/bootstrap.css",
38+
"node_modules/devextreme-dist/css/dx.common.css",
3839
"node_modules/devextreme-dist/css/dx.material.blue.light.compact.css"],
3940
ganttStyles = ["node_modules/devexpress-gantt/dist/dx-gantt.min.css"],
4041
diagramStyles = ["node_modules/devexpress-diagram/dist/dx-diagram.min.css"];
@@ -108,4 +109,4 @@ gulp.task("add:fonts", function () {
108109
return gulp.src(["node_modules/devextreme-dist/css/fonts/*"]).pipe(gulp.dest(paths.fonts));
109110
})
110111

111-
gulp.task("add-resources", gulp.series(["add:js", "add:css", "add:icons", "add:fonts"]));
112+
gulp.task("add-resources", gulp.series(["add:js", "add:css", "add:icons", "add:fonts"]));

0 commit comments

Comments
 (0)