Skip to content

Commit 2e94cfa

Browse files
Create 24.2.1+ branch
1 parent ca6878f commit 2e94cfa

File tree

5 files changed

+174
-181
lines changed

5 files changed

+174
-181
lines changed

CS/MVCDashboardDesigner/MVCDashboardDesigner.csproj

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion>
8-
</ProductVersion>
7+
<ProductVersion></ProductVersion>
98
<SchemaVersion>2.0</SchemaVersion>
109
<ProjectGuid>{CC272148-F54B-41CF-8F78-5B6A63147F84}</ProjectGuid>
1110
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1211
<OutputType>Library</OutputType>
1312
<AppDesignerFolder>Properties</AppDesignerFolder>
1413
<RootNamespace>MVCDashboardDesigner</RootNamespace>
1514
<AssemblyName>MVCDashboardDesigner</AssemblyName>
16-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1716
<MvcBuildViews>false</MvcBuildViews>
18-
<FileUpgradeFlags>
19-
</FileUpgradeFlags>
17+
<FileUpgradeFlags></FileUpgradeFlags>
2018
<OldToolsVersion>4.0</OldToolsVersion>
2119
<UseIISExpress>true</UseIISExpress>
2220
<IISExpressSSLPort />
@@ -118,106 +116,109 @@
118116
<Reference Include="System.Configuration" />
119117
<Reference Include="System.Web.Services" />
120118
<Reference Include="System.EnterpriseServices" />
121-
<Reference Include="DevExpress.Data.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
119+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
122120
<Private>False</Private>
123121
</Reference>
124-
<Reference Include="DevExpress.Web.ASPxThemes.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
122+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
125123
<Private>False</Private>
126124
</Reference>
127-
<Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
125+
<Reference Include="DevExpress.Web.ASPxThemes.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
128126
<Private>False</Private>
129127
</Reference>
130-
<Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
128+
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
131129
<Private>False</Private>
132130
</Reference>
133-
<Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
131+
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
134132
<Private>False</Private>
135133
</Reference>
136-
<Reference Include="DevExpress.Web.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
134+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
137135
<Private>False</Private>
138136
</Reference>
139-
<Reference Include="DevExpress.Web.Mvc5.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
137+
<Reference Include="DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
140138
<Private>False</Private>
141139
</Reference>
142-
<Reference Include="DevExpress.Dashboard.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
140+
<Reference Include="DevExpress.Web.Mvc5.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
143141
<Private>False</Private>
144142
</Reference>
145-
<Reference Include="DevExpress.Dashboard.v21.2.Web, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
143+
<Reference Include="DevExpress.Dashboard.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
146144
<Private>False</Private>
147145
</Reference>
148-
<Reference Include="DevExpress.Dashboard.v21.2.Web.WebForms, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
146+
<Reference Include="DevExpress.Dashboard.v24.2.Web, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
149147
<Private>False</Private>
150148
</Reference>
151-
<Reference Include="DevExpress.Dashboard.v21.2.Web.Mvc5, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
149+
<Reference Include="DevExpress.Dashboard.v24.2.Web.WebForms, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
152150
<Private>False</Private>
153151
</Reference>
154-
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
152+
<Reference Include="DevExpress.Dashboard.v24.2.Web.Mvc5, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
155153
<Private>False</Private>
156154
</Reference>
157-
<Reference Include="DevExpress.Xpo.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
155+
<Reference Include="DevExpress.DataAccess.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
158156
<Private>False</Private>
159157
</Reference>
160-
<Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
158+
<Reference Include="DevExpress.Xpo.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
161159
<Private>False</Private>
162160
</Reference>
163-
<Reference Include="DevExpress.Web.Resources.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
161+
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
164162
<Private>False</Private>
165163
</Reference>
166-
<Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
164+
<Reference Include="DevExpress.Web.Resources.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
167165
<Private>False</Private>
168166
</Reference>
169-
<Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
167+
<Reference Include="DevExpress.Charts.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
170168
<Private>False</Private>
171169
</Reference>
172-
<Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
170+
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
173171
<Private>False</Private>
174172
</Reference>
175-
<Reference Include="DevExpress.TreeMap.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
173+
<Reference Include="DevExpress.PivotGrid.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
176174
<Private>False</Private>
177175
</Reference>
178-
<Reference Include="DevExpress.Map.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
176+
<Reference Include="DevExpress.TreeMap.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
179177
<Private>False</Private>
180178
</Reference>
181-
<Reference Include="DevExpress.XtraTreeMap.v21.2.UI, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
179+
<Reference Include="DevExpress.Map.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
182180
<Private>False</Private>
183181
</Reference>
184-
<Reference Include="DevExpress.XtraTreeMap.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
182+
<Reference Include="DevExpress.XtraTreeMap.v24.2.UI, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
185183
<Private>False</Private>
186184
</Reference>
187-
<Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
185+
<Reference Include="DevExpress.XtraTreeMap.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
188186
<Private>False</Private>
189187
</Reference>
190-
<Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
188+
<Reference Include="DevExpress.Sparkline.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
191189
<Private>False</Private>
192190
</Reference>
193-
<Reference Include="DevExpress.Utils.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
191+
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
194192
<Private>False</Private>
195193
</Reference>
196-
<Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
194+
<Reference Include="DevExpress.Utils.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
197195
<Private>False</Private>
198196
</Reference>
199-
<Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
197+
<Reference Include="DevExpress.XtraCharts.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
200198
<Private>False</Private>
201199
</Reference>
202-
<Reference Include="DevExpress.XtraGauges.v21.2.Presets, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
200+
<Reference Include="DevExpress.XtraGauges.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
203201
<Private>False</Private>
204202
</Reference>
205-
<Reference Include="DevExpress.XtraGauges.v21.2.Win, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
203+
<Reference Include="DevExpress.XtraGauges.v24.2.Presets, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
206204
<Private>False</Private>
207205
</Reference>
208-
<Reference Include="DevExpress.XtraMap.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
206+
<Reference Include="DevExpress.XtraGauges.v24.2.Win, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
209207
<Private>False</Private>
210208
</Reference>
211-
<Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
209+
<Reference Include="DevExpress.XtraMap.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
212210
<Private>False</Private>
213211
</Reference>
214-
<Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
212+
<Reference Include="DevExpress.CodeParser.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
215213
<Private>False</Private>
216214
</Reference>
217-
<Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
215+
<Reference Include="DevExpress.XtraReports.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
218216
<Private>False</Private>
219217
</Reference>
220-
<Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
218+
<Reference Include="DevExpress.XtraEditors.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
219+
<Private>False</Private>
220+
</Reference>
221+
<Reference Include="DevExpress.XtraPrinting.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
221222
<Private>False</Private>
222223
</Reference>
223224
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -325,11 +326,10 @@
325326
<IISUrl>http://localhost:50911/</IISUrl>
326327
<NTLMAuthentication>False</NTLMAuthentication>
327328
<UseCustomServer>False</UseCustomServer>
328-
<CustomServerUrl>
329-
</CustomServerUrl>
329+
<CustomServerUrl></CustomServerUrl>
330330
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
331331
</WebProjectProperties>
332332
</FlavorProperties>
333333
</VisualStudio>
334334
</ProjectExtensions>
335-
</Project>
335+
</Project>

CS/MVCDashboardDesigner/Views/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

0 commit comments

Comments
 (0)