Skip to content

Commit 66b80b1

Browse files
andreylepikhovandreylepikhov
committed
auto sync for version 2023.1
1 parent 5ba2a04 commit 66b80b1

35 files changed

+445
-400
lines changed

‎Angular/RWCSAngularExample/ClientApp/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@angular/platform-server": "^15.0.0",
2121
"@angular/router": "^15.0.0",
2222
"aspnet-prerendering": "^3.0.1",
23-
"devextreme": "^22.2.4",
24-
"@devexpress/analytics-core": "^22.2.4",
25-
"devexpress-reporting-angular": "^22.2.4",
23+
"devextreme": "23.1-next",
24+
"@devexpress/analytics-core": "23.1-next",
25+
"devexpress-reporting-angular": "23.1-next",
2626
"bootstrap": "^4.3.1",
2727
"core-js": "^2.6.5",
2828
"rxjs": "~7.5.0",

‎Angular/RWCSAngularExample/ClientApp/src/ImageClasses.css

-4
This file was deleted.

‎Angular/RWCSAngularExample/ClientApp/src/app/reportdesigner/report-designer.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { addToBindingsCache } from '@devexpress/analytics-core/analytics-utils'
44
import * as ko from 'knockout';
55
import * as $ from 'jquery';
66

7-
87
@Component({
98
selector: 'report-designer',
109
encapsulation: ViewEncapsulation.None,

‎Angular/RWCSAngularExample/NuGet.config

-6
This file was deleted.

‎Angular/RWCSAngularExample/RWCSAngularExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.0" />
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
1616
<PackageReference Include="System.Data.SQLite" Version="1.0.114.4" />
17-
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="22.2.*-*" />
17+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.1.*-*" />
1818
<PackageReference Include="System.Text.Json" Version="7.0.2" />
1919
</ItemGroup>
2020
<ItemGroup>

‎AspNetCore/RWCSAspNetCoreExample/PredefinedReports/LabelReport.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AspNetCore/RWCSAspNetCoreExample/PredefinedReports/LabelReport.repx

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<XtraReportsLayoutSerializer SerializerVersion="23.1.0.0" Ref="0" ControlType="DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.1, Version=23.1.0.0, Culture=neutral, PublicKeyToken=79868b8147b5eae4" Name="Report1" DisplayName="LabelReport" PageWidth="850" PageHeight="1100" Version="23.1" Font="Arial, 9pt">
3+
<Bands>
4+
<Item1 Ref="1" ControlType="TopMarginBand" Name="TopMargin1" />
5+
<Item2 Ref="2" ControlType="DetailBand" Name="Detail1">
6+
<Controls>
7+
<Item1 Ref="3" ControlType="XRLabel" Name="label3" Multiline="true" Text="label3" SizeF="100,23" LocationFloat="418.75,34.375" Padding="2,2,0,0,100" />
8+
<Item2 Ref="4" ControlType="XRLabel" Name="label2" Multiline="true" Text="label2" SizeF="100,23" LocationFloat="202.083,34.375" Padding="2,2,0,0,100" />
9+
<Item3 Ref="5" ControlType="XRLabel" Name="label1" Multiline="true" Text="label1" SizeF="100,23" LocationFloat="32.292,34.375" Padding="2,2,0,0,100" />
10+
</Controls>
11+
</Item2>
12+
<Item3 Ref="6" ControlType="BottomMarginBand" Name="BottomMargin1" />
13+
</Bands>
14+
</XtraReportsLayoutSerializer>

‎AspNetCore/RWCSAspNetCoreExample/RWCSAspNetCoreExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
4949
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
5050
<PackageReference Include="System.Data.SQLite" Version="1.0.114.4" />
51-
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="22.2.*-*" />
51+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.1.*-*" />
5252
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
5353
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
5454
</ItemGroup>

‎AspNetCore/RWCSAspNetCoreExample/bundleconfig.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"outputFileName": "wwwroot/css/dx.material.blue.dark.bundle.css",
1414
"inputFiles": [
15-
"node_modules/devextreme/dist/css/dx.material.blue.dark.css",
15+
"node_modules/devextreme-dist/css/dx.material.blue.dark.css",
1616
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.blue.dark.css"
1717
],
1818
"minify": {
@@ -23,7 +23,7 @@
2323
{
2424
"outputFileName": "wwwroot/css/dx.material.blue.light.bundle.css",
2525
"inputFiles": [
26-
"node_modules/devextreme/dist/css/dx.material.blue.light.css",
26+
"node_modules/devextreme-dist/css/dx.material.blue.light.css",
2727
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.blue.light.css"
2828
],
2929
"minify": {
@@ -34,7 +34,7 @@
3434
{
3535
"outputFileName": "wwwroot/css/dx.material.lime.dark.bundle.css",
3636
"inputFiles": [
37-
"node_modules/devextreme/dist/css/dx.material.lime.dark.css",
37+
"node_modules/devextreme-dist/css/dx.material.lime.dark.css",
3838
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.lime.dark.css"
3939
],
4040
"minify": {
@@ -45,7 +45,7 @@
4545
{
4646
"outputFileName": "wwwroot/css/dx.material.lime.light.bundle.css",
4747
"inputFiles": [
48-
"node_modules/devextreme/dist/css/dx.material.lime.light.css",
48+
"node_modules/devextreme-dist/css/dx.material.lime.light.css",
4949
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.lime.light.css"
5050
],
5151
"minify": {
@@ -56,7 +56,7 @@
5656
{
5757
"outputFileName": "wwwroot/css/dx.material.orange.dark.bundle.css",
5858
"inputFiles": [
59-
"node_modules/devextreme/dist/css/dx.material.orange.dark.css",
59+
"node_modules/devextreme-dist/css/dx.material.orange.dark.css",
6060
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.orange.dark.css"
6161
],
6262
"minify": {
@@ -67,7 +67,7 @@
6767
{
6868
"outputFileName": "wwwroot/css/dx.material.orange.light.bundle.css",
6969
"inputFiles": [
70-
"node_modules/devextreme/dist/css/dx.material.orange.light.css",
70+
"node_modules/devextreme-dist/css/dx.material.orange.light.css",
7171
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.orange.light.css"
7272
],
7373
"minify": {
@@ -78,7 +78,7 @@
7878
{
7979
"outputFileName": "wwwroot/css/dx.material.purple.dark.bundle.css",
8080
"inputFiles": [
81-
"node_modules/devextreme/dist/css/dx.material.purple.dark.css",
81+
"node_modules/devextreme-dist/css/dx.material.purple.dark.css",
8282
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.purple.dark.css"
8383
],
8484
"minify": {
@@ -89,7 +89,7 @@
8989
{
9090
"outputFileName": "wwwroot/css/dx.material.purple.light.bundle.css",
9191
"inputFiles": [
92-
"node_modules/devextreme/dist/css/dx.material.purple.light.css",
92+
"node_modules/devextreme-dist/css/dx.material.purple.light.css",
9393
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.purple.light.css"
9494
],
9595
"minify": {
@@ -100,7 +100,7 @@
100100
{
101101
"outputFileName": "wwwroot/css/dx.material.teal.dark.bundle.css",
102102
"inputFiles": [
103-
"node_modules/devextreme/dist/css/dx.material.teal.dark.css",
103+
"node_modules/devextreme-dist/css/dx.material.teal.dark.css",
104104
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.teal.dark.css"
105105
],
106106
"minify": {
@@ -111,7 +111,7 @@
111111
{
112112
"outputFileName": "wwwroot/css/dx.material.teal.light.bundle.css",
113113
"inputFiles": [
114-
"node_modules/devextreme/dist/css/dx.material.teal.light.css",
114+
"node_modules/devextreme-dist/css/dx.material.teal.light.css",
115115
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.teal.light.css"
116116
],
117117
"minify": {
@@ -122,7 +122,7 @@
122122
{
123123
"outputFileName": "wwwroot/css/dx.light.bundle.css",
124124
"inputFiles": [
125-
"node_modules/devextreme/dist/css/dx.light.css",
125+
"node_modules/devextreme-dist/css/dx.light.css",
126126
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.light.css"
127127
],
128128
"minify": {
@@ -133,7 +133,7 @@
133133
{
134134
"outputFileName": "wwwroot/css/dx.dark.bundle.css",
135135
"inputFiles": [
136-
"node_modules/devextreme/dist/css/dx.dark.css",
136+
"node_modules/devextreme-dist/css/dx.dark.css",
137137
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.dark.css"
138138
],
139139
"minify": {
@@ -144,7 +144,7 @@
144144
{
145145
"outputFileName": "wwwroot/css/dx.carmine.bundle.css",
146146
"inputFiles": [
147-
"node_modules/devextreme/dist/css/dx.carmine.css",
147+
"node_modules/devextreme-dist/css/dx.carmine.css",
148148
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.carmine.css"
149149
],
150150
"minify": {
@@ -155,7 +155,7 @@
155155
{
156156
"outputFileName": "wwwroot/css/dx.darkmoon.bundle.css",
157157
"inputFiles": [
158-
"node_modules/devextreme/dist/css/dx.darkmoon.css",
158+
"node_modules/devextreme-dist/css/dx.darkmoon.css",
159159
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.darkmoon.css"
160160
],
161161
"minify": {
@@ -166,7 +166,7 @@
166166
{
167167
"outputFileName": "wwwroot/css/dx.darkviolet.bundle.css",
168168
"inputFiles": [
169-
"node_modules/devextreme/dist/css/dx.darkviolet.css",
169+
"node_modules/devextreme-dist/css/dx.darkviolet.css",
170170
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.darkviolet.css"
171171
],
172172
"minify": {
@@ -177,7 +177,7 @@
177177
{
178178
"outputFileName": "wwwroot/css/dx.greenmist.bundle.css",
179179
"inputFiles": [
180-
"node_modules/devextreme/dist/css/dx.greenmist.css",
180+
"node_modules/devextreme-dist/css/dx.greenmist.css",
181181
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.greenmist.css"
182182
],
183183
"minify": {
@@ -188,7 +188,7 @@
188188
{
189189
"outputFileName": "wwwroot/css/dx.softblue.bundle.css",
190190
"inputFiles": [
191-
"node_modules/devextreme/dist/css/dx.softblue.css",
191+
"node_modules/devextreme-dist/css/dx.softblue.css",
192192
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.softblue.css"
193193
],
194194
"minify": {
@@ -257,7 +257,7 @@
257257
{
258258
"outputFileName": "wwwroot/js/viewer.part.bundle.js",
259259
"inputFiles": [
260-
"node_modules/devextreme/dist/js/dx.all.js",
260+
"node_modules/devextreme-dist/js/dx.all.js",
261261
"node_modules/@devexpress/analytics-core/dist/js/dx-analytics-core.min.js",
262262
"node_modules/devexpress-reporting/dist/js/dx-webdocumentviewer.min.js"
263263
],

‎AspNetCore/RWCSAspNetCoreExample/libman.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"libraries": [
55

66
{
7-
"library": "node_modules/devextreme/dist/css/icons/",
7+
"library": "node_modules/devextreme-dist/css/icons/",
88
"destination": "wwwroot/css/icons",
99
"files": [
1010
"dxiconsmaterial.ttf",

‎AspNetCore/RWCSAspNetCoreExample/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"private": true,
66
"dependencies": {
77
"bootstrap": "^4.3.1",
8-
"devextreme": "22.2-stable",
9-
"@devexpress/analytics-core": "22.2-stable",
10-
"devexpress-reporting": "22.2-stable"
8+
"devextreme-dist": "23.1-stable",
9+
"@devexpress/analytics-core": "23.1-stable",
10+
"devexpress-reporting": "23.1-stable"
1111
}
1212
}

‎AspNetCore/RWCSAspNetCoreExample/wwwroot/css/ImageClasses.css

-6
This file was deleted.

‎AspNetCore/RWCSAspNetCoreExample/wwwroot/css/dx-reporting-skeleton-screen.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AspNetCore/RWCSAspNetCoreExample/wwwroot/css/dx.carmine.bundle.css

+21-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@charset "UTF-8";
22
/**
33
* DevExtreme (dx.carmine.css)
4-
* Version: 22.2.4
5-
* Build date: Thu Jan 19 2023
4+
* Version: 23.1.0 (build 23054-0308)
5+
* Build date: Thu Feb 23 2023
66
*
77
* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
88
* Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -2352,6 +2352,12 @@
23522352
margin-right: 0;
23532353
margin-left: 0;
23542354
}
2355+
.dx-button a {
2356+
text-decoration: none;
2357+
}
2358+
.dx-button-back .dx-button-text {
2359+
display: none;
2360+
}
23552361
.dx-button-content {
23562362
-webkit-box-flex: 1;
23572363
-ms-flex: 1 1 auto;
@@ -2366,6 +2372,7 @@
23662372
-ms-flex-pack: center;
23672373
justify-content: center;
23682374
vertical-align: middle;
2375+
line-height: 1.35715;
23692376
}
23702377
.dx-button-has-text .dx-button-content,
23712378
.dx-button-has-text .dx-button-content .dx-button-text {
@@ -2395,9 +2402,6 @@
23952402
.dx-button-text {
23962403
line-height: 1.2858;
23972404
}
2398-
.dx-button a {
2399-
text-decoration: none;
2400-
}
24012405
.dx-button .dx-button-content {
24022406
padding: 8px;
24032407
}
@@ -2475,9 +2479,6 @@
24752479
margin-right: 0;
24762480
margin-left: 0;
24772481
}
2478-
.dx-button-back .dx-button-text {
2479-
display: none;
2480-
}
24812482
.dx-button {
24822483
border-radius: 2px;
24832484
border-width: 1px;
@@ -2730,16 +2731,6 @@
27302731
background-color: transparent;
27312732
border-radius: 2px;
27322733
}
2733-
.dx-texteditor-buttons-container > .dx-button {
2734-
margin: 1px;
2735-
}
2736-
.dx-texteditor-buttons-container > .dx-button > .dx-button-content {
2737-
padding-top: 5px;
2738-
padding-bottom: 6px;
2739-
}
2740-
.dx-texteditor-buttons-container > .dx-button.dx-button-has-icon:not(.dx-button-has-text) > .dx-button-content {
2741-
padding: 6px;
2742-
}
27432734
.dx-buttongroup {
27442735
display: inline-block;
27452736
}
@@ -4422,6 +4413,16 @@
44224413
text-align: center;
44234414
line-height: 18px;
44244415
}
4416+
.dx-texteditor-buttons-container > .dx-button {
4417+
margin: 1px;
4418+
}
4419+
.dx-texteditor-buttons-container > .dx-button > .dx-button-content {
4420+
padding-top: 5px;
4421+
padding-bottom: 6px;
4422+
}
4423+
.dx-texteditor-buttons-container > .dx-button.dx-button-has-icon:not(.dx-button-has-text) > .dx-button-content {
4424+
padding: 6px;
4425+
}
44254426
.dx-placeholder::before {
44264427
padding: 7px 9px 8px;
44274428
}
@@ -22980,8 +22981,8 @@ input.dx-hidden {
2298022981
}
2298122982
/**
2298222983
* DevExpress Analytics (dist\css\dx-analytics.carmine.css)
22983-
* Version: 22.2.4
22984-
* Build date: Jan 25, 2023
22984+
* Version: 23.1.1-build-2354-1337
22985+
* Build date: Feb 23, 2023
2298522986
* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
2298622987
* License: https://www.devexpress.com/Support/EULAs/universal.xml
2298722988
*/

0 commit comments

Comments
 (0)