Resolve merge conflicts and finalize merge

Author: AlisherAmonulloev

.gitattributes

@@ -1,3 +1,5 @@
+* text=auto eol=lf
+
 VB/* linguist-vendored
 scripts linguist-vendored
 *.css linguist-detectable=false

.github/workflows/lint.yml

@@ -73,7 +73,9 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
 
     - name: Restore npm cache
       uses: actions/cache@v3

.github/workflows/typescript.yml

@@ -44,7 +44,9 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
 
     - name: Restore npm cache
       uses: actions/cache@v3

.gitignore

@@ -303,3 +303,8 @@ TesterMetadata.xml
 
 # Backup files
 *.bak
+
+*/wwwroot/*
+
+!*/wwwroot/css/Site.css
+*.DS_Store

Angular/README.md

@@ -1,28 +1,35 @@
-# AngularTest
+# Angular DevExtreme Example
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.1.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.4 and includes DevExtreme Angular components version 24.2.3.
 
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+Run `npm start` or `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 
 Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
+Run `npm run build` or `ng build` to build the project. The build artifacts will be stored in the `dist/Angular/` directory.
 
 ## Running unit tests
 
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+Run `npm test` or `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Linting
+
+Run `npm run lint` to execute linting checks for TypeScript, CSS/SCSS, and HTML formatting.
+- `npm run lint-ts` - ESLint for TypeScript files
+- `npm run lint-css` - Stylelint for CSS/SCSS files  
+- `npm run lint-html` - Prettier for HTML formatting
 
 ## Running end-to-end tests
 
 Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
 
 ## Further help
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
-To get more help on DevExtreme submit an issue on [GitHub](https://github.com/DevExpress/devextreme/issues) or [Support Center](https://www.devexpress.com/Support/Center/Question/Create)
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
+To get more help on DevExtreme submit an issue on [GitHub](https://github.com/DevExpress/devextreme/issues) or [Support Center](https://supportcenter.devexpress.com/ticket/create)

Angular/angular.json

@@ -67,18 +67,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "Angular:build:production"
+              "buildTarget": "Angular:build:production"
             },
             "development": {
-              "browserTarget": "Angular:build:development"
+              "buildTarget": "Angular:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "Angular:build"
+            "buildTarget": "Angular:build"
           }
         },
         "test": {

Angular/ngcc.config.js

@@ -1,15 +1,15 @@
-module.exports = {
-    packages: {
-      'devextreme-angular':  {
-        ignorableDeepImportMatchers: [
-          /devextreme\//,
-          /jszip\//
-        ]
-      },
-      'devextreme' : {
-        ignorableDeepImportMatchers: [
-          /devextreme-quill\//
-        ]
-      }
-    }
-  };
+module.exports = {
+    packages: {
+      'devextreme-angular':  {
+        ignorableDeepImportMatchers: [
+          /devextreme\//,
+          /jszip\//
+        ]
+      },
+      'devextreme' : {
+        ignorableDeepImportMatchers: [
+          /devextreme-quill\//
+        ]
+      }
+    }
+  };