Skip to content

Commit 862a3e3

Browse files
AlexiliaAlexilia
committed
Convert to Net5
1 parent f4ff69f commit 862a3e3

11 files changed

+662
-439
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,3 +306,9 @@ TesterMetadata.xml
306306

307307
# Backup files
308308
.bak
309+
310+
311+
# ProjectUpdrade & TryConvert files
312+
*.csproj.old
313+
*.vbproj.old
314+
*.bak

‎CS/Dashboard_UnderlyingDataWPF.Net5.sln

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 16
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard_UnderlyingDataWPF", "Dashboard_UnderlyingDataWPF\Dashboard_UnderlyingDataWPF.Net5.csproj", "{3E03F6D7-9789-422E-9C03-CC1212C5B258}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎CS/Dashboard_UnderlyingDataWPF.sln

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard_UnderlyingDataWPF", "Dashboard_UnderlyingDataWPF\Dashboard_UnderlyingDataWPF.csproj", "{3E03F6D7-9789-422E-9C03-CC1212C5B258}"
7-
EndProject
8-
Global
9-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
11-
Release|Any CPU = Release|Any CPU
12-
EndGlobalSection
13-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.Build.0 = Release|Any CPU
18-
EndGlobalSection
19-
GlobalSection(SolutionProperties) = preSolution
20-
HideSolutionNode = FALSE
21-
EndGlobalSection
22-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard_UnderlyingDataWPF", "Dashboard_UnderlyingDataWPF\Dashboard_UnderlyingDataWPF.csproj", "{3E03F6D7-9789-422E-9C03-CC1212C5B258}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{3E03F6D7-9789-422E-9C03-CC1212C5B258}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎CS/Dashboard_UnderlyingDataWPF/App.config

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
38
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
510
</startup>
11+
12+
<userSettings>
13+
<DXThemeManager>
14+
<setting name="ApplicationThemeName" serializeAs="String">
15+
<value>Office2016White</value>
16+
</setting>
17+
</DXThemeManager>
18+
</userSettings>
619
</configuration>

‎CS/Dashboard_UnderlyingDataWPF/Dashboard_UnderlyingDataWPF.Net5.csproj

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net5.0-windows</TargetFramework>
4+
<OutputType>WinExe</OutputType>
5+
<RootNamespace>Dashboard_UnderlyingDataWPF</RootNamespace>
6+
<AssemblyName>Dashboard_UnderlyingDataWPF</AssemblyName>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<UseWindowsForms>true</UseWindowsForms>
9+
<UseWPF>true</UseWPF>
10+
<Platforms>x86;AnyCPU</Platforms>
11+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
12+
<DefaultItemExcludes>obj*/**</DefaultItemExcludes>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<Compile Update="SalesDashboard.cs">
19+
<SubType>Component</SubType>
20+
</Compile>
21+
</ItemGroup>
22+
<ItemGroup>
23+
<None Update="Data\NWind_SalesPerson.dat">
24+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
25+
</None>
26+
<AppDesigner Include="Properties\" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<PackageReference Include="DevExpress.Dashboard.Core" Version="21.1.*-*" />
30+
<PackageReference Include="DevExpress.Data" Version="21.1.*-*" />
31+
<PackageReference Include="DevExpress.Data.Desktop" Version="21.1.*-*" />
32+
<PackageReference Include="DevExpress.DataAccess" Version="21.1.*-*" />
33+
<PackageReference Include="DevExpress.Map.Core" Version="21.1.*-*" />
34+
<PackageReference Include="DevExpress.Mvvm" Version="21.1.*-*" />
35+
<PackageReference Include="DevExpress.Office.Core" Version="21.1.*-*" />
36+
<PackageReference Include="DevExpress.PivotGrid.Core" Version="21.1.*-*" />
37+
<PackageReference Include="DevExpress.Printing.Core" Version="21.1.*-*" />
38+
<PackageReference Include="DevExpress.RichEdit.Core" Version="21.1.*-*" />
39+
<PackageReference Include="DevExpress.Sparkline.Core" Version="21.1.*-*" />
40+
<PackageReference Include="DevExpress.Wpf.Charts" Version="21.1.*-*" />
41+
<PackageReference Include="DevExpress.Wpf.Core" Version="21.1.*-*" />
42+
<PackageReference Include="DevExpress.Wpf.Dashboard" Version="21.1.*-*" />
43+
<PackageReference Include="DevExpress.Wpf.Docking" Version="21.1.*-*" />
44+
<PackageReference Include="DevExpress.Wpf.Grid.Core" Version="21.1.*-*" />
45+
<PackageReference Include="DevExpress.Wpf.LayoutControl" Version="21.1.*-*" />
46+
<PackageReference Include="DevExpress.Wpf.Map" Version="21.1.*-*" />
47+
<PackageReference Include="DevExpress.Wpf.Office" Version="21.1.*-*" />
48+
<PackageReference Include="DevExpress.Wpf.PivotGrid" Version="21.1.*-*" />
49+
<PackageReference Include="DevExpress.Wpf.Printing" Version="21.1.*-*" />
50+
<PackageReference Include="DevExpress.Wpf.PropertyGrid" Version="21.1.*-*" />
51+
<PackageReference Include="DevExpress.Wpf.RichEdit" Version="21.1.*-*" />
52+
<PackageReference Include="DevExpress.Wpf.TreeMap" Version="21.1.*-*" />
53+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="21.1.*-*" />
54+
</ItemGroup>
55+
</Project>

0 commit comments

Comments
 (0)