Skip to content

Commit f56f802

Browse files
BrianDXBrianDX
committed
fix serialization changes, startup.cs->program.cs
1 parent f17a032 commit f56f802

15 files changed

+1243
-319
lines changed

‎.gitignore

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

‎CustomParameterEditorAspNetCoreExample/Controllers/HomeController.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ public IActionResult Error() {
1010
Models.ErrorModel model = new Models.ErrorModel();
1111
return View(model);
1212
}
13-
public ActionResult Designer()
14-
{
13+
public ActionResult Designer() {
1514
var report = new DevExpress.XtraReports.UI.XtraReport();
1615
report.Extensions[SerializationService.Guid] = CustomDataSerializer.Name;
1716
return View(report);
1817
}
19-
public ActionResult Viewer()
20-
{
18+
public ActionResult Viewer() {
2119
return View();
2220
}
2321
}

‎CustomParameterEditorAspNetCoreExample/CustomParameterEditorAspNetCoreExample.csproj

+6-19
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<DefaultItemExcludes>Reports\**</DefaultItemExcludes>
66
</PropertyGroup>
7-
<ItemGroup>
8-
<Compile Remove="Reports\**" />
9-
<Content Remove="Reports\**" />
10-
<EmbeddedResource Remove="Reports\**" />
11-
<None Remove="Reports\**" />
12-
</ItemGroup>
137
<ItemGroup>
148
<None Remove="Data\nwind.db" />
159
</ItemGroup>
@@ -27,17 +21,6 @@
2721
<ItemGroup>
2822
<EmbeddedResource Include="PredefinedReports\*.vsrepx" />
2923
</ItemGroup>
30-
<ItemGroup>
31-
<None Remove="PredefinedReports\TestReport.vsrepx" />
32-
</ItemGroup>
33-
<ItemGroup>
34-
<Compile Update="PredefinedReports\TestReport.cs">
35-
<DependentUpon>TestReport.vsrepx</DependentUpon>
36-
</Compile>
37-
<Compile Update="PredefinedReports\TestReport.Designer.cs">
38-
<DependentUpon>TestReport.vsrepx</DependentUpon>
39-
</Compile>
40-
</ItemGroup>
4124
<Target Name="DebugEnsureNodeEnv" BeforeTargets="LibraryManagerRestore" Condition="!Exists('node_modules') ">
4225
<!-- Ensure Node.js is installed -->
4326
<Exec Command="node --version" ContinueOnError="true">
@@ -49,9 +32,13 @@
4932
</Target>
5033
<ItemGroup>
5134
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
52-
<PackageReference Include="System.Data.SQLite" Version="1.0.113.1" />
53-
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.2.*-*" />
35+
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
36+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.2.7" />
5437
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
5538
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
5639
</ItemGroup>
40+
<ItemGroup>
41+
<None Include="Reports\CustomParameterReport.repx" />
42+
<None Include="Reports\TemplateReport.repx" />
43+
</ItemGroup>
5744
</Project>

0 commit comments

Comments
 (0)