Skip to content

Commit 1ffd652

Browse files
andreylepikhovandreylepikhov
committed
auto sync for version 2023.2
1 parent 72dfc62 commit 1ffd652

File tree

10 files changed

+90
-73
lines changed

10 files changed

+90
-73
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import * as $ from 'jquery';
99
encapsulation: ViewEncapsulation.None,
1010
templateUrl: './report-designer.html',
1111
styleUrls: [
12+
'../../../node_modules/ace-builds/css/ace.css',
13+
'../../../node_modules/ace-builds/css/theme/dreamweaver.css',
14+
'../../../node_modules/ace-builds/css/theme/ambiance.css',
1215
"../../../node_modules/devextreme/dist/css/dx.material.blue.light.css",
1316
"../../../node_modules/@devexpress/analytics-core/dist/css/dx-analytics.common.css",
1417
"../../../node_modules/@devexpress/analytics-core/dist/css/dx-analytics.material.blue.light.css",

‎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="23.1.*-*" />
17+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.2.*-*" />
1818
<PackageReference Include="System.Text.Json" Version="7.0.2" />
1919
</ItemGroup>
2020
<ItemGroup>

‎AspNetCore/RWCSAspNetCoreExample/RWCSAspNetCoreExample.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
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="23.1.*-*" />
51+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.2.*-*" />
5252
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
53-
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
53+
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
5454
</ItemGroup>
5555
</Project>

‎AspNetCore/RWCSAspNetCoreExample/Views/Home/Designer.cshtml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<link href="~/css/dx-reporting-skeleton-screen.css" rel="stylesheet" />
1616
<link rel="stylesheet" href="~/css/viewer.part.bundle.css" />
1717
<link rel="stylesheet" href="~/css/designer.part.bundle.css" />
18+
<link rel="stylesheet" href="~/css/ace/ace.bundle.css" />
1819
<link rel="stylesheet" href="~/css/dx.material.blue.light.bundle.css" />
1920

2021
<script src="~/js/reporting.thirdparty.bundle.js"></script>

‎AspNetCore/RWCSAspNetCoreExample/bundleconfig.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,18 @@
228228
"adjustRelativePaths": false
229229
}
230230
},
231+
{
232+
"outputFileName": "wwwroot/css/ace/ace.bundle.css",
233+
"inputFiles": [
234+
"node_modules/ace-builds/css/ace.css",
235+
"node_modules/ace-builds/css/theme/dreamweaver.css",
236+
"node_modules/ace-builds/css/theme/ambiance.css"
237+
],
238+
"minify": {
239+
"enabled": false,
240+
"adjustRelativePaths": false
241+
}
242+
},
231243
{
232244
"outputFileName": "wwwroot/js/site.thirdparty.bundle.js",
233245
"inputFiles": [
@@ -245,8 +257,6 @@
245257
"node_modules/knockout/build/output/knockout-latest.js",
246258
"node_modules/ace-builds/src-min-noconflict/ace.js",
247259
"node_modules/ace-builds/src-min-noconflict/ext-language_tools.js",
248-
"node_modules/ace-builds/src-min-noconflict/theme-dreamweaver.js",
249-
"node_modules/ace-builds/src-min-noconflict/theme-ambiance.js",
250260
"node_modules/ace-builds/src-min-noconflict/snippets/text.js"
251261
],
252262
"minify": {

‎AspNetCore/RWCSAspNetCoreExample/libman.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
"version": "1.0",
33
"defaultProvider": "filesystem",
44
"libraries": [
5-
5+
{
6+
"library": "node_modules/ace-builds/css/",
7+
"destination": "wwwroot/css/ace",
8+
"files": [ "*.png", "*.svg" ]
9+
},
610
{
711
"library": "node_modules/devextreme-dist/css/icons/",
812
"destination": "wwwroot/css/icons",

‎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-dist": "23.1-stable",
9-
"@devexpress/analytics-core": "23.1-stable",
10-
"devexpress-reporting": "23.1-stable"
8+
"devextreme-dist": "23.2-stable",
9+
"@devexpress/analytics-core": "23.2-stable",
10+
"devexpress-reporting": "23.2-stable"
1111
}
1212
}

‎Mvc/ReportWizardCustomizationServiceMvcExample/ReportWizardCustomizationServiceMvcExample.csproj

+23-23
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="DevExpress.Data.Desktop.v23.1">
46+
<Reference Include="DevExpress.Data.Desktop.v23.2">
4747
<SpecificVersion>False</SpecificVersion>
4848
</Reference>
4949
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -139,70 +139,70 @@
139139
<Reference Include="System.Web.Services" />
140140
<Reference Include="System.EnterpriseServices" />
141141
<Reference Include="System.ServiceModel" />
142-
<Reference Include="DevExpress.Data.v23.1">
142+
<Reference Include="DevExpress.Data.v23.2">
143143
<SpecificVersion>False</SpecificVersion>
144144
</Reference>
145-
<Reference Include="DevExpress.Web.ASPxThemes.v23.1">
145+
<Reference Include="DevExpress.Web.ASPxThemes.v23.2">
146146
<SpecificVersion>False</SpecificVersion>
147147
</Reference>
148-
<Reference Include="DevExpress.RichEdit.v23.1.Core">
148+
<Reference Include="DevExpress.RichEdit.v23.2.Core">
149149
<SpecificVersion>False</SpecificVersion>
150150
</Reference>
151-
<Reference Include="DevExpress.RichEdit.v23.1.Export">
151+
<Reference Include="DevExpress.RichEdit.v23.2.Export">
152152
<SpecificVersion>False</SpecificVersion>
153153
</Reference>
154-
<Reference Include="DevExpress.Printing.v23.1.Core">
154+
<Reference Include="DevExpress.Printing.v23.2.Core">
155155
<SpecificVersion>False</SpecificVersion>
156156
</Reference>
157-
<Reference Include="DevExpress.Web.v23.1">
157+
<Reference Include="DevExpress.Web.v23.2">
158158
<SpecificVersion>False</SpecificVersion>
159159
</Reference>
160-
<Reference Include="DevExpress.Web.Mvc5.v23.1">
160+
<Reference Include="DevExpress.Web.Mvc5.v23.2">
161161
<SpecificVersion>False</SpecificVersion>
162162
</Reference>
163-
<Reference Include="DevExpress.XtraReports.v23.1">
163+
<Reference Include="DevExpress.XtraReports.v23.2">
164164
<SpecificVersion>False</SpecificVersion>
165165
</Reference>
166-
<Reference Include="DevExpress.XtraReports.v23.1.Web">
166+
<Reference Include="DevExpress.XtraReports.v23.2.Web">
167167
<SpecificVersion>False</SpecificVersion>
168168
</Reference>
169-
<Reference Include="DevExpress.XtraReports.v23.1.Web.WebForms">
169+
<Reference Include="DevExpress.XtraReports.v23.2.Web.WebForms">
170170
<SpecificVersion>False</SpecificVersion>
171171
</Reference>
172-
<Reference Include="DevExpress.Drawing.v23.1">
172+
<Reference Include="DevExpress.Drawing.v23.2">
173173
<SpecificVersion>False</SpecificVersion>
174174
</Reference>
175-
<Reference Include="DevExpress.Pdf.v23.1.Core">
175+
<Reference Include="DevExpress.Pdf.v23.2.Core">
176176
<SpecificVersion>False</SpecificVersion>
177177
</Reference>
178-
<Reference Include="DevExpress.Web.Resources.v23.1">
178+
<Reference Include="DevExpress.Web.Resources.v23.2">
179179
<SpecificVersion>False</SpecificVersion>
180180
</Reference>
181-
<Reference Include="DevExpress.Charts.v23.1.Core">
181+
<Reference Include="DevExpress.Charts.v23.2.Core">
182182
<SpecificVersion>False</SpecificVersion>
183183
</Reference>
184-
<Reference Include="DevExpress.CodeParser.v23.1">
184+
<Reference Include="DevExpress.CodeParser.v23.2">
185185
<SpecificVersion>False</SpecificVersion>
186186
</Reference>
187-
<Reference Include="DevExpress.DataAccess.v23.1">
187+
<Reference Include="DevExpress.DataAccess.v23.2">
188188
<SpecificVersion>False</SpecificVersion>
189189
</Reference>
190-
<Reference Include="DevExpress.Office.v23.1.Core">
190+
<Reference Include="DevExpress.Office.v23.2.Core">
191191
<SpecificVersion>False</SpecificVersion>
192192
</Reference>
193-
<Reference Include="DevExpress.PivotGrid.v23.1.Core">
193+
<Reference Include="DevExpress.PivotGrid.v23.2.Core">
194194
<SpecificVersion>False</SpecificVersion>
195195
</Reference>
196-
<Reference Include="DevExpress.Sparkline.v23.1.Core">
196+
<Reference Include="DevExpress.Sparkline.v23.2.Core">
197197
<SpecificVersion>False</SpecificVersion>
198198
</Reference>
199-
<Reference Include="DevExpress.Xpo.v23.1">
199+
<Reference Include="DevExpress.Xpo.v23.2">
200200
<SpecificVersion>False</SpecificVersion>
201201
</Reference>
202-
<Reference Include="DevExpress.XtraCharts.v23.1">
202+
<Reference Include="DevExpress.XtraCharts.v23.2">
203203
<SpecificVersion>False</SpecificVersion>
204204
</Reference>
205-
<Reference Include="DevExpress.XtraGauges.v23.1.Core">
205+
<Reference Include="DevExpress.XtraGauges.v23.2.Core">
206206
<SpecificVersion>False</SpecificVersion>
207207
</Reference>
208208
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)