Skip to content

Commit edb6735

Browse files
Merge branch '26_1' into 26_1_regenerate_angular_wrappers
2 parents c1ad64b + 4c4bb27 commit edb6735

File tree

77 files changed

+4712
-3910
lines changed

Some content is hidden

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

77 files changed

+4712
-3910
lines changed

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

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

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

.github/workflows/qunit_tests.yml

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

7371
- name: Zip artifacts

packages/devextreme/build/build-dotnet.sln

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/devextreme/docker-ci.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# 1. GITHUBACTION=true (GitHub Actions)
88
# - Runs NATIVELY on GitHub runner (NO Docker container!)
9-
# - Uses pre-installed Chrome and dotnet
9+
# - Uses pre-installed Chrome and Node.js
1010
# - Dependencies already installed by workflow
1111
# - Fastest and most stable mode
1212
#
@@ -79,8 +79,11 @@ function run_test_impl {
7979
pnpm run build
8080
fi
8181

82-
echo "Starting ASP.NET Core test runner..."
83-
dotnet ./testing/runner/bin/runner.dll --single-run & runner_pid=$!
82+
echo "Compiling TypeScript test runner..."
83+
pnpm exec tsc -p ./testing/runner/tsconfig.json
84+
85+
echo "Starting Node.js test runner..."
86+
node ./testing/runner/dist/index.js --single-run & runner_pid=$!
8487
echo "Runner PID: $runner_pid"
8588

8689
local max_attempts=30
@@ -241,7 +244,7 @@ function start_runner_watchdog {
241244
echo "Watchdog running in background (PID: $watchdog_pid)"
242245
}
243246

244-
echo "node $(node -v), pnpm $(pnpm -v), dotnet $(dotnet --version)"
247+
echo "node $(node -v), pnpm $(pnpm -v)"
245248

246249
TARGET_FUNC="run_$TARGET"
247250

packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class CompactAppointmentsHelper {
164164

165165
_createTemplate(count, isCompact) {
166166
this._initButtonTemplate(count, isCompact);
167-
return this.instance._getAppointmentTemplate('appointmentCollectorTemplate');
167+
return this.instance.getAppointmentTemplate('appointmentCollectorTemplate');
168168
}
169169

170170
_initButtonTemplate(count, isCompact) {

0 commit comments

Comments
 (0)