Skip to content

Commit 24da08a

Browse files
AlexiliaAlexilia
committed
Convert to Net5
1 parent 74bcaf6 commit 24da08a

11 files changed

+434
-259
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/Digital Gauge.Net5.sln

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Microsoft Visual Studio Solution File, Format Version 11.00
2+
# Visual Studio 16
3+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digital Gauge", "Digital Gauge\Digital Gauge.Net5.csproj", "{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}"
4+
EndProject
5+
Global
6+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7+
Debug|x86 = Debug|x86
8+
Release|x86 = Release|x86
9+
EndGlobalSection
10+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
11+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.ActiveCfg = Debug|x86
12+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.Build.0 = Debug|x86
13+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.ActiveCfg = Release|x86
14+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.Build.0 = Release|x86
15+
EndGlobalSection
16+
GlobalSection(SolutionProperties) = preSolution
17+
HideSolutionNode = FALSE
18+
EndGlobalSection
19+
EndGlobal

‎CS/Digital Gauge.sln

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
2-
# Visual Studio 2010
3-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digital Gauge", "Digital Gauge\Digital Gauge.csproj", "{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}"
4-
EndProject
5-
Global
6-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7-
Debug|x86 = Debug|x86
8-
Release|x86 = Release|x86
9-
EndGlobalSection
10-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
11-
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.ActiveCfg = Debug|x86
12-
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.Build.0 = Debug|x86
13-
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.ActiveCfg = Release|x86
14-
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.Build.0 = Release|x86
15-
EndGlobalSection
16-
GlobalSection(SolutionProperties) = preSolution
17-
HideSolutionNode = FALSE
18-
EndGlobalSection
19-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 11.00
2+
# Visual Studio 2012
3+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digital Gauge", "Digital Gauge\Digital Gauge.csproj", "{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}"
4+
EndProject
5+
Global
6+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7+
Debug|x86 = Debug|x86
8+
Release|x86 = Release|x86
9+
EndGlobalSection
10+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
11+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.ActiveCfg = Debug|x86
12+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.Build.0 = Debug|x86
13+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.ActiveCfg = Release|x86
14+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.Build.0 = Release|x86
15+
EndGlobalSection
16+
GlobalSection(SolutionProperties) = preSolution
17+
HideSolutionNode = FALSE
18+
EndGlobalSection
19+
EndGlobal

‎CS/Digital Gauge/Digital Gauge.Net5.csproj

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net5.0-windows</TargetFramework>
4+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<OutputType>WinExe</OutputType>
6+
<RootNamespace>Digital_Gauge</RootNamespace>
7+
<AssemblyName>Digital Gauge</AssemblyName>
8+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9+
<UseWindowsForms>true</UseWindowsForms>
10+
<UseWPF>true</UseWPF>
11+
<Platforms>x86;AnyCPU</Platforms>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
14+
<DefaultItemExcludes>obj*/**</DefaultItemExcludes>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<AppDesigner Include="Properties\" />
18+
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="DevExpress.Data" Version="21.1.*-*" />
21+
<PackageReference Include="DevExpress.Data.Desktop" Version="21.1.*-*" />
22+
<PackageReference Include="DevExpress.Mvvm" Version="21.1.*-*" />
23+
<PackageReference Include="DevExpress.Office.Core" Version="21.1.*-*" />
24+
<PackageReference Include="DevExpress.Pdf.Core" Version="21.1.*-*" />
25+
<PackageReference Include="DevExpress.Printing.Core" Version="21.1.*-*" />
26+
<PackageReference Include="DevExpress.RichEdit.Core" Version="21.1.*-*" />
27+
<PackageReference Include="DevExpress.RichEdit.Export" Version="21.1.*-*" />
28+
<PackageReference Include="DevExpress.Wpf.Core" Version="21.1.*-*" />
29+
<PackageReference Include="DevExpress.Wpf.Gauges" Version="21.1.*-*" />
30+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="21.1.*-*" />
31+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="21.1.*-*" />
32+
</ItemGroup>
33+
</Project>

‎CS/Digital Gauge/Digital Gauge.csproj

+115-105
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,121 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}</ProjectGuid>
9-
<OutputType>WinExe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Digital_Gauge</RootNamespace>
12-
<AssemblyName>Digital Gauge</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<WarningLevel>4</WarningLevel>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
20-
<PlatformTarget>x86</PlatformTarget>
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
31-
<PlatformTarget>x86</PlatformTarget>
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
35-
<DefineConstants>TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
38-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
39-
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="DevExpress.Data.v13.1, Version=13.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
42-
<Reference Include="DevExpress.Xpf.Mvvm.v13.1, Version=13.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
43-
<Reference Include="DevExpress.Xpf.Core.v13.1, Version=13.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
44-
<Reference Include="DevExpress.Xpf.Gauges.v13.1, Version=13.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
45-
<Reference Include="System" />
46-
<Reference Include="System.Data" />
47-
<Reference Include="System.Drawing" />
48-
<Reference Include="System.Xml" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.Xml.Linq" />
52-
<Reference Include="System.Data.DataSetExtensions" />
53-
<Reference Include="System.Xaml">
54-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
55-
</Reference>
56-
<Reference Include="UIAutomationProvider" />
57-
<Reference Include="WindowsBase" />
58-
<Reference Include="PresentationCore" />
59-
<Reference Include="PresentationFramework" />
60-
</ItemGroup>
61-
<ItemGroup>
62-
<ApplicationDefinition Include="App.xaml">
63-
<Generator>MSBuild:Compile</Generator>
64-
<SubType>Designer</SubType>
65-
</ApplicationDefinition>
66-
<Page Include="MainWindow.xaml">
67-
<Generator>MSBuild:Compile</Generator>
68-
<SubType>Designer</SubType>
69-
</Page>
70-
<Compile Include="App.xaml.cs">
71-
<DependentUpon>App.xaml</DependentUpon>
72-
<SubType>Code</SubType>
73-
</Compile>
74-
<Compile Include="MainWindow.xaml.cs">
75-
<DependentUpon>MainWindow.xaml</DependentUpon>
76-
<SubType>Code</SubType>
77-
</Compile>
78-
</ItemGroup>
79-
<ItemGroup>
80-
<Compile Include="Properties\AssemblyInfo.cs">
81-
<SubType>Code</SubType>
82-
</Compile>
83-
<Compile Include="Properties\Resources.Designer.cs">
84-
<AutoGen>True</AutoGen>
85-
<DesignTime>True</DesignTime>
86-
<DependentUpon>Resources.resx</DependentUpon>
87-
</Compile>
88-
<Compile Include="Properties\Settings.Designer.cs">
89-
<AutoGen>True</AutoGen>
90-
<DependentUpon>Settings.settings</DependentUpon>
91-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
92-
</Compile>
93-
<EmbeddedResource Include="Properties\Resources.resx">
94-
<Generator>ResXFileCodeGenerator</Generator>
95-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
96-
</EmbeddedResource>
97-
<None Include="Properties\Settings.settings">
98-
<Generator>SettingsSingleFileGenerator</Generator>
99-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
100-
</None>
101-
<AppDesigner Include="Properties\" />
102-
</ItemGroup>
103-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}</ProjectGuid>
9+
<OutputType>WinExe</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>Digital_Gauge</RootNamespace>
12+
<AssemblyName>Digital Gauge</AssemblyName>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16+
<WarningLevel>4</WarningLevel>
17+
<BaseIntermediateOutputPath>obj.NetFX</BaseIntermediateOutputPath>
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
20+
<PlatformTarget>x86</PlatformTarget>
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>bin\Debug\</OutputPath>
25+
<DefineConstants>DEBUG;TRACE</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
31+
<PlatformTarget>x86</PlatformTarget>
32+
<DebugType>pdbonly</DebugType>
33+
<Optimize>true</Optimize>
34+
<OutputPath>bin\Release\</OutputPath>
35+
<DefineConstants>TRACE</DefineConstants>
36+
<ErrorReport>prompt</ErrorReport>
37+
<WarningLevel>4</WarningLevel>
38+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
39+
</PropertyGroup>
40+
<ItemGroup>
41+
<Reference Include="DevExpress.Data.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
42+
<Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
43+
<Reference Include="DevExpress.Pdf.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
44+
<Reference Include="DevExpress.Office.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
45+
<Reference Include="DevExpress.RichEdit.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
46+
<Reference Include="DevExpress.RichEdit.v21.1.Export, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
47+
<Reference Include="DevExpress.Printing.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
48+
<Reference Include="DevExpress.Xpf.CodeView.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
49+
<Reference Include="DevExpress.Data.Desktop.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
50+
<Reference Include="DevExpress.Xpf.Core.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
51+
<Reference Include="DevExpress.Xpf.Gauges.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
52+
<Reference Include="System" />
53+
<Reference Include="System.Data" />
54+
<Reference Include="System.Drawing" />
55+
<Reference Include="System.Xml" />
56+
<Reference Include="Microsoft.CSharp" />
57+
<Reference Include="System.Core" />
58+
<Reference Include="System.Xml.Linq" />
59+
<Reference Include="System.Data.DataSetExtensions" />
60+
<Reference Include="System.Xaml">
61+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
62+
</Reference>
63+
<Reference Include="UIAutomationProvider" />
64+
<Reference Include="WindowsBase" />
65+
<Reference Include="PresentationCore" />
66+
<Reference Include="PresentationFramework" />
67+
</ItemGroup>
68+
<ItemGroup>
69+
<ApplicationDefinition Include="App.xaml">
70+
<Generator>MSBuild:Compile</Generator>
71+
<SubType>Designer</SubType>
72+
</ApplicationDefinition>
73+
<Page Include="MainWindow.xaml">
74+
<Generator>MSBuild:Compile</Generator>
75+
<SubType>Designer</SubType>
76+
</Page>
77+
<Compile Include="App.xaml.cs">
78+
<DependentUpon>App.xaml</DependentUpon>
79+
<SubType>Code</SubType>
80+
</Compile>
81+
<Compile Include="MainWindow.xaml.cs">
82+
<DependentUpon>MainWindow.xaml</DependentUpon>
83+
<SubType>Code</SubType>
84+
</Compile>
85+
</ItemGroup>
86+
<ItemGroup>
87+
<Compile Include="Properties\AssemblyInfo.cs">
88+
<SubType>Code</SubType>
89+
</Compile>
90+
<Compile Include="Properties\Resources.Designer.cs">
91+
<AutoGen>True</AutoGen>
92+
<DesignTime>True</DesignTime>
93+
<DependentUpon>Resources.resx</DependentUpon>
94+
</Compile>
95+
<Compile Include="Properties\Settings.Designer.cs">
96+
<AutoGen>True</AutoGen>
97+
<DependentUpon>Settings.settings</DependentUpon>
98+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
99+
</Compile>
100+
<EmbeddedResource Include="Properties\Resources.resx">
101+
<Generator>ResXFileCodeGenerator</Generator>
102+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
103+
</EmbeddedResource>
104+
<None Include="Properties\Settings.settings">
105+
<Generator>SettingsSingleFileGenerator</Generator>
106+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
107+
</None>
108+
<AppDesigner Include="Properties\" />
109+
</ItemGroup>
110+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104111
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105112
Other similar extension points exist, see Microsoft.Common.targets.
106113
<Target Name="BeforeBuild">
107114
</Target>
108115
<Target Name="AfterBuild">
109116
</Target>
110-
-->
111-
</Project>
117+
-->
118+
<ItemGroup>
119+
<None Include="app.config" />
120+
</ItemGroup>
121+
</Project>

‎CS/Digital Gauge/app.config

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
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>
8+
<userSettings>
9+
<DXThemeManager>
10+
<setting name="ApplicationThemeName" serializeAs="String">
11+
<value>Office2016White</value>
12+
</setting>
13+
</DXThemeManager>
14+
</userSettings>
15+
</configuration>

‎VB/Digital Gauge.Net5.sln

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Microsoft Visual Studio Solution File, Format Version 11.00
2+
# Visual Studio 16
3+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Digital Gauge", "Digital Gauge\Digital Gauge.Net5.vbproj", "{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}"
4+
EndProject
5+
Global
6+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7+
Debug|x86 = Debug|x86
8+
Release|x86 = Release|x86
9+
EndGlobalSection
10+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
11+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.ActiveCfg = Debug|x86
12+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Debug|x86.Build.0 = Debug|x86
13+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.ActiveCfg = Release|x86
14+
{8A6D80F7-D1B8-4E01-AA0E-EDB5E3D60EE8}.Release|x86.Build.0 = Release|x86
15+
EndGlobalSection
16+
GlobalSection(SolutionProperties) = preSolution
17+
HideSolutionNode = FALSE
18+
EndGlobalSection
19+
EndGlobal

0 commit comments

Comments
 (0)