Skip to content

Commit 51a9143

Browse files
AlexiliaAlexilia
committed
Convert to Net5
1 parent 7488698 commit 51a9143

13 files changed

+599
-375
lines changed

‎.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,9 @@ __pycache__/
294294
*.btp.cs
295295
*.btm.cs
296296
*.odx.cs
297-
*.xsd.cs
297+
*.xsd.cs
298+
299+
# ProjectUpdrade & TryConvert files
300+
*.csproj.old
301+
*.vbproj.old
302+
*.bak

‎CS/WpfApplication1.Net5.sln

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 16
3+
VisualStudioVersion = 12.0.40629.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication1", "WpfApplication1\WpfApplication1.Net5.csproj", "{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
EndGlobal

‎CS/WpfApplication1.sln

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.40629.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication1", "WpfApplication1\WpfApplication1.csproj", "{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Any CPU = Debug|Any CPU
10-
Release|Any CPU = Release|Any CPU
11-
EndGlobalSection
12-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.Build.0 = Release|Any CPU
17-
EndGlobalSection
18-
GlobalSection(SolutionProperties) = preSolution
19-
HideSolutionNode = FALSE
20-
EndGlobalSection
21-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 2012
3+
VisualStudioVersion = 12.0.40629.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication1", "WpfApplication1\WpfApplication1.csproj", "{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{0162F1A9-2ED8-45AD-B0BC-D05D86D90408}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
EndGlobal

‎CS/WpfApplication1/App.config

+16-3
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.0"/>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
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/WpfApplication1/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:dxrud="http://schemas.devexpress.com/winfx/2008/xaml/reports/userdesigner"
44
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
5-
xmlns:dxrim="clr-namespace:DevExpress.Xpf.Reports.UserDesigner;assembly=DevExpress.Xpf.ReportDesigner.v16.2"
5+
xmlns:dxrim="clr-namespace:DevExpress.Xpf.Reports.UserDesigner;assembly=DevExpress.Xpf.ReportDesigner.v21.1"
66
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
77
x:Class="WpfApplication1.MainWindow"
88
Title="MainWindow" Height="900" Width="1200">

‎CS/WpfApplication1/WpfApplication1.Net5.csproj

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net5.0-windows</TargetFramework>
4+
<OutputType>WinExe</OutputType>
5+
<RootNamespace>WpfApplication1</RootNamespace>
6+
<AssemblyName>WpfApplication1</AssemblyName>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<UseWindowsForms>true</UseWindowsForms>
9+
<UseWPF>true</UseWPF>
10+
<Platforms>x86;AnyCPU</Platforms>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
12+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
13+
<DefaultItemExcludes>obj*/**</DefaultItemExcludes>
14+
</PropertyGroup>
15+
<ItemGroup>
16+
<Compile Update="XtraReport1.cs">
17+
<SubType>Component</SubType>
18+
</Compile>
19+
</ItemGroup>
20+
<ItemGroup>
21+
<AppDesigner Include="Properties\" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="DevExpress.Charts" Version="21.1.*-*" />
25+
<PackageReference Include="DevExpress.Charts.Core" Version="21.1.*-*" />
26+
<PackageReference Include="DevExpress.CodeParser" Version="21.1.*-*" />
27+
<PackageReference Include="DevExpress.Data" Version="21.1.*-*" />
28+
<PackageReference Include="DevExpress.Data.Desktop" Version="21.1.*-*" />
29+
<PackageReference Include="DevExpress.DataAccess" Version="21.1.*-*" />
30+
<PackageReference Include="DevExpress.Diagram.Core" Version="21.1.*-*" />
31+
<PackageReference Include="DevExpress.Gauges.Core" Version="21.1.*-*" />
32+
<PackageReference Include="DevExpress.Images" Version="21.1.*-*" />
33+
<PackageReference Include="DevExpress.Mvvm" Version="21.1.*-*" />
34+
<PackageReference Include="DevExpress.Office.Core" Version="21.1.*-*" />
35+
<PackageReference Include="DevExpress.Pdf.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.Reporting.Core" Version="21.1.*-*" />
39+
<PackageReference Include="DevExpress.RichEdit.Core" Version="21.1.*-*" />
40+
<PackageReference Include="DevExpress.RichEdit.Export" Version="21.1.*-*" />
41+
<PackageReference Include="DevExpress.Sparkline.Core" Version="21.1.*-*" />
42+
<PackageReference Include="DevExpress.Utils" Version="21.1.*-*" />
43+
<PackageReference Include="DevExpress.Utils.UI" Version="21.1.*-*" />
44+
<PackageReference Include="DevExpress.Win.Navigation" Version="21.1.*-*" />
45+
<PackageReference Include="DevExpress.Win.Printing" Version="21.1.*-*" />
46+
<PackageReference Include="DevExpress.Win.Reporting" Version="21.1.*-*" />
47+
<PackageReference Include="DevExpress.Wpf.Controls" Version="21.1.*-*" />
48+
<PackageReference Include="DevExpress.Wpf.Core" Version="21.1.*-*" />
49+
<PackageReference Include="DevExpress.Wpf.Diagram" Version="21.1.*-*" />
50+
<PackageReference Include="DevExpress.Wpf.Docking" Version="21.1.*-*" />
51+
<PackageReference Include="DevExpress.Wpf.ExpressionEditor" Version="21.1.*-*" />
52+
<PackageReference Include="DevExpress.Wpf.Grid.Core" Version="21.1.*-*" />
53+
<PackageReference Include="DevExpress.Wpf.PivotGrid" Version="21.1.*-*" />
54+
<PackageReference Include="DevExpress.Wpf.Printing" Version="21.1.*-*" />
55+
<PackageReference Include="DevExpress.Wpf.PropertyGrid" Version="21.1.*-*" />
56+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="21.1.*-*" />
57+
<PackageReference Include="DevExpress.Wpf.Ribbon" Version="21.1.*-*" />
58+
<PackageReference Include="DevExpress.Xpo" Version="21.1.*-*" />
59+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="21.1.*-*" />
60+
</ItemGroup>
61+
</Project>

0 commit comments

Comments
 (0)