Skip to content

Commit d60c2b0

Browse files
auto sync for version 2022.2
1 parent 081ad65 commit d60c2b0

21 files changed

+64
-39702
lines changed

.gitignore

+10-297
Original file line numberDiff line numberDiff line change
@@ -1,297 +1,10 @@
1-
## Ignore Visual Studio temporary files, build results, and
2-
## files generated by popular Visual Studio add-ons.
3-
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
5-
6-
# User-specific files
7-
*.suo
8-
*.user
9-
*.userosscache
10-
*.sln.docstates
11-
12-
# User-specific files (MonoDevelop/Xamarin Studio)
13-
*.userprefs
14-
15-
# Build results
16-
[Dd]ebug/
17-
[Dd]ebugPublic/
18-
[Rr]elease/
19-
[Rr]eleases/
20-
x64/
21-
x86/
22-
bld/
23-
[Oo]bj/
24-
[Ll]og/
25-
26-
# Visual Studio 2015 cache/options directory
27-
.vs/
28-
# Uncomment if you have tasks that create the project's static files in wwwroot
29-
#wwwroot/
30-
31-
# MSTest test Results
32-
[Tt]est[Rr]esult*/
33-
[Bb]uild[Ll]og.*
34-
35-
# NUNIT
36-
*.VisualState.xml
37-
TestResult.xml
38-
39-
# Build Results of an ATL Project
40-
[Dd]ebugPS/
41-
[Rr]eleasePS/
42-
dlldata.c
43-
44-
# Benchmark Results
45-
BenchmarkDotNet.Artifacts/
46-
47-
# .NET Core
48-
project.lock.json
49-
project.fragment.lock.json
50-
artifacts/
51-
**/Properties/launchSettings.json
52-
53-
*_i.c
54-
*_p.c
55-
*_i.h
56-
*.ilk
57-
*.meta
58-
*.obj
59-
*.pch
60-
*.pdb
61-
*.pgc
62-
*.pgd
63-
*.sbr
64-
*.tlb
65-
*.tli
66-
*.tlh
67-
*.tmp
68-
*.tmp_proj
69-
*.log
70-
*.vspscc
71-
*.vssscc
72-
.builds
73-
*.pidb
74-
*.svclog
75-
*.scc
76-
77-
# Chutzpah Test files
78-
_Chutzpah*
79-
80-
# Visual C++ cache files
81-
ipch/
82-
*.aps
83-
*.ncb
84-
*.opendb
85-
*.opensdf
86-
#*.sdf
87-
*.cachefile
88-
*.VC.db
89-
*.VC.VC.opendb
90-
91-
# Visual Studio profiler
92-
*.psess
93-
*.vsp
94-
*.vspx
95-
*.sap
96-
97-
# TFS 2012 Local Workspace
98-
$tf/
99-
100-
# Guidance Automation Toolkit
101-
*.gpState
102-
103-
# ReSharper is a .NET coding add-in
104-
_ReSharper*/
105-
*.[Rr]e[Ss]harper
106-
*.DotSettings.user
107-
108-
# JustCode is a .NET coding add-in
109-
.JustCode
110-
111-
# TeamCity is a build add-in
112-
_TeamCity*
113-
114-
# DotCover is a Code Coverage Tool
115-
*.dotCover
116-
117-
# AxoCover is a Code Coverage Tool
118-
.axoCover/*
119-
!.axoCover/settings.json
120-
121-
# Visual Studio code coverage results
122-
*.coverage
123-
*.coveragexml
124-
125-
# NCrunch
126-
_NCrunch_*
127-
.*crunch*.local.xml
128-
nCrunchTemp_*
129-
130-
# MightyMoose
131-
*.mm.*
132-
AutoTest.Net/
133-
134-
# Web workbench (sass)
135-
.sass-cache/
136-
137-
# Installshield output folder
138-
[Ee]xpress/
139-
140-
# DocProject is a documentation generator add-in
141-
DocProject/buildhelp/
142-
DocProject/Help/*.HxT
143-
DocProject/Help/*.HxC
144-
DocProject/Help/*.hhc
145-
DocProject/Help/*.hhk
146-
DocProject/Help/*.hhp
147-
DocProject/Help/Html2
148-
DocProject/Help/html
149-
150-
# Click-Once directory
151-
publish/
152-
153-
# Publish Web Output
154-
*.[Pp]ublish.xml
155-
*.azurePubxml
156-
# Note: Comment the next line if you want to checkin your web deploy settings,
157-
# but database connection strings (with potential passwords) will be unencrypted
158-
*.pubxml
159-
*.publishproj
160-
161-
# Microsoft Azure Web App publish settings. Comment the next line if you want to
162-
# checkin your Azure Web App publish settings, but sensitive information contained
163-
# in these scripts will be unencrypted
164-
PublishScripts/
165-
166-
# NuGet Packages
167-
*.nupkg
168-
# The packages folder can be ignored because of Package Restore
169-
**/packages/*
170-
# except build/, which is used as an MSBuild target.
171-
!**/packages/build/
172-
# Uncomment if necessary however generally it will be regenerated when needed
173-
#!**/packages/repositories.config
174-
# NuGet v3's project.json files produces more ignorable files
175-
*.nuget.props
176-
*.nuget.targets
177-
178-
# Microsoft Azure Build Output
179-
csx/
180-
*.build.csdef
181-
182-
# Microsoft Azure Emulator
183-
ecf/
184-
rcf/
185-
186-
# Windows Store app package directories and files
187-
AppPackages/
188-
BundleArtifacts/
189-
Package.StoreAssociation.xml
190-
_pkginfo.txt
191-
*.appx
192-
193-
# Visual Studio cache files
194-
# files ending in .cache can be ignored
195-
*.[Cc]ache
196-
# but keep track of directories ending in .cache
197-
!*.[Cc]ache/
198-
199-
# Others
200-
ClientBin/
201-
~$*
202-
*~
203-
*.dbmdl
204-
*.dbproj.schemaview
205-
*.jfm
206-
*.pfx
207-
*.publishsettings
208-
orleans.codegen.cs
209-
210-
# Since there are multiple workflows, uncomment next line to ignore bower_components
211-
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
212-
#bower_components/
213-
214-
# RIA/Silverlight projects
215-
Generated_Code/
216-
217-
# Backup & report files from converting an old project file
218-
# to a newer Visual Studio version. Backup files are not needed,
219-
# because we have git ;-)
220-
_UpgradeReport_Files/
221-
Backup*/
222-
UpgradeLog*.XML
223-
UpgradeLog*.htm
224-
225-
# SQL Server files
226-
#*.mdf
227-
#*.ldf
228-
#*.ndf
229-
230-
# Business Intelligence projects
231-
*.rdl.data
232-
*.bim.layout
233-
*.bim_*.settings
234-
235-
# Microsoft Fakes
236-
FakesAssemblies/
237-
238-
# GhostDoc plugin setting file
239-
*.GhostDoc.xml
240-
241-
# Node.js Tools for Visual Studio
242-
.ntvs_analysis.dat
243-
node_modules/
244-
245-
# Typescript v1 declaration files
246-
typings/
247-
248-
# Visual Studio 6 build log
249-
*.plg
250-
251-
# Visual Studio 6 workspace options file
252-
*.opt
253-
254-
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
255-
*.vbw
256-
257-
# Visual Studio LightSwitch build output
258-
**/*.HTMLClient/GeneratedArtifacts
259-
**/*.DesktopClient/GeneratedArtifacts
260-
**/*.DesktopClient/ModelManifest.xml
261-
**/*.Server/GeneratedArtifacts
262-
**/*.Server/ModelManifest.xml
263-
_Pvt_Extensions
264-
265-
# Paket dependency manager
266-
.paket/paket.exe
267-
paket-files/
268-
269-
# FAKE - F# Make
270-
.fake/
271-
272-
# JetBrains Rider
273-
.idea/
274-
*.sln.iml
275-
276-
# CodeRush
277-
.cr/
278-
279-
# Python Tools for Visual Studio (PTVS)
280-
__pycache__/
281-
*.pyc
282-
283-
# Cake - Uncomment if you are using it
284-
# tools/**
285-
# !tools/packages.config
286-
287-
# Tabs Studio
288-
*.tss
289-
290-
# Telerik's JustMock configuration file
291-
*.jmconfig
292-
293-
# BizTalk build output
294-
*.btp.cs
295-
*.btm.cs
296-
*.odx.cs
297-
*.xsd.cs
1+
package-lock.json
2+
**/wwwroot/css/icons/dxicons.ttf
3+
**/wwwroot/css/icons/dxicons.woff
4+
**/wwwroot/css/icons/dxicons.woff2
5+
**/wwwroot/css/dx-reporting-skeleton-screen.css
6+
**/wwwroot/css/thirdparty.bundle.css
7+
**/wwwroot/css/viewer.part.bundle.css
8+
**/wwwroot/js/reporting.thirdparty.bundle.js
9+
**/wwwroot/js/viewer.part.bundle.js
10+
**/wwwroot/js/site.thirdparty.bundle.js

CS/.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package-lock.json
2+
**/wwwroot/css/icons/dxicons.ttf
3+
**/wwwroot/css/icons/dxicons.woff
4+
**/wwwroot/css/icons/dxicons.woff2
5+
**/wwwroot/css/dx-reporting-skeleton-screen.css
6+
**/wwwroot/css/thirdparty.bundle.css
7+
**/wwwroot/css/viewer.part.bundle.css
8+
**/wwwroot/js/reporting.thirdparty.bundle.js
9+
**/wwwroot/js/viewer.part.bundle.js
10+
**/wwwroot/js/site.thirdparty.bundle.js
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using DevExpress.AspNetCore.Reporting.QueryBuilder;
2+
using DevExpress.AspNetCore.Reporting.QueryBuilder.Native.Services;
3+
using DevExpress.AspNetCore.Reporting.ReportDesigner;
4+
using DevExpress.AspNetCore.Reporting.ReportDesigner.Native.Services;
5+
using DevExpress.AspNetCore.Reporting.WebDocumentViewer;
6+
using DevExpress.AspNetCore.Reporting.WebDocumentViewer.Native.Services;
7+
8+
namespace ReportingApp.Controllers {
9+
public class CustomWebDocumentViewerController : WebDocumentViewerController {
10+
public CustomWebDocumentViewerController(IWebDocumentViewerMvcControllerService controllerService) : base(controllerService) {
11+
}
12+
}
13+
14+
public class CustomReportDesignerController : ReportDesignerController {
15+
public CustomReportDesignerController(IReportDesignerMvcControllerService controllerService) : base(controllerService) {
16+
}
17+
}
18+
19+
public class CustomQueryBuilderController : QueryBuilderController {
20+
public CustomQueryBuilderController(IQueryBuilderMvcControllerService controllerService) : base(controllerService) {
21+
}
22+
}
23+
}

CS/ReportingApp/ReportingApp.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<DefaultItemExcludes>Reports\**</DefaultItemExcludes>
55
</PropertyGroup>
66
<ItemGroup>
@@ -34,12 +34,12 @@
3434
<EmbeddedResource Include="PredefinedReports\XtraReport1.repx" />
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
38-
<PackageReference Include="System.Data.SQLite" Version="1.0.109.2" />
39-
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="21.1.*-*" />
40-
<PackageReference Include="BuildBundlerMinifier" Version="3.0.415" />
41-
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.0.96" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
37+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
38+
<PackageReference Include="System.Data.SQLite" Version="1.0.113.1" />
39+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="22.2.*-*" />
40+
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
41+
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.76" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
4343
</ItemGroup>
4444
<ItemGroup>
4545
<Compile Update="PredefinedReports\XtraReport1.cs">

CS/ReportingApp/Services/CustomReportStorageWebExtension.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5+
using System.Web;
56
using DevExpress.XtraReports.UI;
67
using Microsoft.AspNetCore.Hosting;
78
using ReportingApp.PredefinedReports;
8-
using System.Web;
9+
910

1011
namespace ReportingApp.Services
1112
{
@@ -82,9 +83,11 @@ public override byte[] GetData(string url) {
8283
}
8384
}
8485
} catch (Exception ex) {
85-
throw new DevExpress.XtraReports.Web.ClientControls.FaultException("Could not get report data.", ex);
86+
throw new DevExpress.XtraReports.Web.ClientControls.FaultException(
87+
"Could not get report data.", ex);
8688
}
87-
throw new DevExpress.XtraReports.Web.ClientControls.FaultException(string.Format("Could not find report '{0}'.", url));
89+
throw new DevExpress.XtraReports.Web.ClientControls.FaultException(
90+
string.Format("Could not find report '{0}'.", url));
8891
}
8992

9093
public override Dictionary<string, string> GetUrls() {

0 commit comments

Comments
 (0)