Skip to content

Commit 8d64b8a

Browse files
Merge branch '25_2' into 25_2_dx_ng_replace_deprecated
2 parents 837edb1 + 27877b7 commit 8d64b8a

File tree

768 files changed

+21500
-17747
lines changed

Some content is hidden

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

768 files changed

+21500
-17747
lines changed

.github/CODEOWNERS

Lines changed: 143 additions & 148 deletions
Large diffs are not rendered by default.

.github/actions/run-qunit-tests/action.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ runs:
8484
shell: bash
8585
run: pnpm install --frozen-lockfile
8686

87-
- name: Build dotnet
88-
working-directory: ./packages/devextreme
89-
shell: bash
90-
run: dotnet build build/build-dotnet.sln
91-
9287
- name: Run QUnit tests
9388
working-directory: ./packages/devextreme
9489
shell: bash

.github/copilot-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
**Repository Stats:**
88
- **Type:** Monorepo (pnpm workspaces + Nx)
99
- **Size:** Large (1000+ files across multiple packages)
10-
- **Languages:** TypeScript, JavaScript, SCSS, C# (.NET for test runner)
10+
- **Languages:** TypeScript, JavaScript, SCSS
1111
- **Package Manager:** pnpm 9.15.4 (specified in package.json)
1212
- **Node Version:** 20.x (required by CI)
1313
- **Build System:** Gulp + Nx + custom build scripts
@@ -24,7 +24,7 @@ pnpm install --frozen-lockfile
2424

2525
**Node.js:** Version 20.x is required (CI uses Node 20)
2626
**pnpm:** Version 9.15.4 (managed via packageManager field)
27-
**.NET SDK:** Version 8.0.x required for building the test runner (packages/devextreme/testing/runner)
27+
**.NET SDK:** Version 8.0.x required for running devextreme-internal-tools (uses .NET tool for code generation)
2828

2929
### First-Time Setup
3030

.github/workflows/codeql.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,10 @@ jobs:
6666
ref: refs/heads/${{ github.ref_name }}
6767
sha: ${{ steps.get-head-sha.outputs.SHA }}
6868

69-
analyze-csharp:
70-
name: Analyze C#
71-
runs-on: ubuntu-latest
72-
permissions:
73-
actions: read
74-
contents: read
75-
security-events: write
76-
77-
steps:
78-
- name: Checkout repository
79-
uses: actions/checkout@v4
80-
81-
- name: Get head SHA
82-
id: get-head-sha
83-
run: echo "SHA=$(git rev-parse origin/${{ github.ref_name }})" >> "$GITHUB_OUTPUT"
84-
85-
# Initializes the CodeQL tools for scanning.
86-
- name: Initialize CodeQL
87-
uses: github/codeql-action/init@v3
88-
with:
89-
languages: csharp
90-
config-file: ./.github/codeql/codeql-config.yml
91-
92-
- name: Autobuild
93-
uses: github/codeql-action/autobuild@v3
94-
95-
- name: Perform CodeQL Analysis
96-
uses: github/codeql-action/analyze@v3
97-
with:
98-
category: "/language:csharp"
99-
ref: refs/heads/${{ github.ref_name }}
100-
sha: ${{ steps.get-head-sha.outputs.SHA }}
101-
10269
fetch:
10370
runs-on: devextreme-shr2
10471
name: Fetch analysis
105-
needs: [ analyze-javascript, analyze-csharp ]
72+
needs: [ analyze-javascript ]
10673

10774
steps:
10875
- name: Get Latest Analysis info

.github/workflows/qunit_tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ jobs:
6767
shell: bash
6868
env:
6969
DEVEXTREME_TEST_CI: "true"
70-
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
71-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
7270
run: pnpx nx build:systemjs
7371

7472
- name: Zip artifacts

.github/workflows/testcafe_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: needs.check-should-run.outputs.should-run == 'true'
3535

3636
runs-on: devextreme-shr2
37-
timeout-minutes: 15
37+
timeout-minutes: 30
3838

3939
steps:
4040
- name: Get sources

apps/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devextreme-angular-playground",
33
"description": "DevExtreme Angular UI and Visualization Components",
44
"private": true,
5-
"version": "25.2.4",
5+
"version": "25.2.5",
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {

apps/demos/Demos/CardView/DataValidation/Angular/app/app.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Component, enableProdMode, provideZoneChangeDetection } from '@angular/
44
import { DxCardViewModule, DxTextAreaModule } from 'devextreme-angular';
55
import { lastValueFrom } from 'rxjs';
66
import { Employee, Service } from './app.service';
7+
import 'anti-forgery';
78

89
if (!/localhost/.test(document.location.host)) {
910
enableProdMode();

apps/demos/Demos/CardView/DataValidation/React/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React from 'react';
22
import ReactDOM from 'react-dom';
33

44
import App from './App.tsx';
5+
// eslint-disable-next-line import/no-unresolved
6+
import 'anti-forgery';
57

68
ReactDOM.render(
79
<App />,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
33
import App from './App.js';
4+
// eslint-disable-next-line import/no-unresolved
5+
import 'anti-forgery';
46

57
ReactDOM.render(<App />, document.getElementById('app'));

0 commit comments

Comments
 (0)