Skip to content

Commit 0100c92

Browse files
author
Umut Çömlekçioğlu
committed
.net core 3.1 migration
1 parent 2bc4aba commit 0100c92

20 files changed

Lines changed: 709 additions & 2661 deletions

File tree

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
73
<ProjectGuid>{95EA884C-E498-4A47-A316-DC890BF7F0D2}</ProjectGuid>
84
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
105
<RootNamespace>NETworkManager.Controls</RootNamespace>
116
<AssemblyName>NETworkManager.Controls</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
7+
<TargetFramework>netcoreapp3.1</TargetFramework>
8+
<UseWPF>true</UseWPF>
9+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1510
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<DocumentationFile>bin\Debug\NETworkManager.Controls.xml</DocumentationFile>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="PresentationCore" />
36-
<Reference Include="PresentationFramework" />
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Xml" />
45-
<Reference Include="WindowsBase" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="..\GlobalAssemblyInfo.cs">
49-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
50-
</Compile>
51-
<Compile Include="MultiSelectDataGrid.cs" />
52-
<Compile Include="MultiSelectScrollingDataGrid.cs" />
53-
<Compile Include="ObservableSetCollection.cs" />
54-
<Compile Include="Properties\AssemblyInfo.cs" />
55-
</ItemGroup>
56-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5711
</Project>
Lines changed: 16 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
73
<ProjectGuid>{BD4DDC21-7B64-41B2-BAC7-8173E0FE84BE}</ProjectGuid>
84
<OutputType>Library</OutputType>
95
<AppDesignerFolder>Properties</AppDesignerFolder>
106
<RootNamespace>NETworkManager.Converters</RootNamespace>
117
<AssemblyName>NETworkManager.Converters</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
8+
<TargetFramework>netcoreapp3.1</TargetFramework>
9+
<UseWPF>true</UseWPF>
10+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2411
<DocumentationFile>bin\Debug\NETworkManager.Converters.xml</DocumentationFile>
2512
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<NoWarn>1701;1702;CS1591</NoWarn>
3315
</PropertyGroup>
16+
3417
<ItemGroup>
35-
<Reference Include="PresentationCore" />
36-
<Reference Include="PresentationFramework" />
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Numerics" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Net.Http" />
45-
<Reference Include="System.Xml" />
46-
<Reference Include="WindowsBase" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Compile Include="..\GlobalAssemblyInfo.cs">
50-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
51-
</Compile>
52-
<Compile Include="AccentToBrushConverter.cs" />
53-
<Compile Include="IsDefaultProfilesLocationToBooleanConverter.cs" />
54-
<Compile Include="IsDefaultSettingsLocationToBooleanConverter.cs" />
55-
<Compile Include="IsProfilesLocationToBooleanConverter.cs" />
56-
<Compile Include="IsSettingsLocationToBooleanConverter.cs" />
57-
<Compile Include="LvlChartsPingTimeValueConverter.cs" />
58-
<Compile Include="PuTTYLogModeToStringConverter.cs" />
59-
<Compile Include="SettingsViewGroupToTranslatedStringConverter.cs" />
60-
<Compile Include="SettingsViewNameToTranslatedStringConverter.cs" />
61-
<Compile Include="ProfileViewNameToTranslatedStringConverter.cs" />
62-
<Compile Include="BandwidthBytesToSpeedConverter.cs" />
63-
<Compile Include="BandwidthBytesWithSizeConverter.cs" />
64-
<Compile Include="BigIntegerToStringConverter.cs" />
65-
<Compile Include="BooleanReverseConverter.cs" />
66-
<Compile Include="BooleanReverseToVisibilityCollapsedConverter.cs" />
67-
<Compile Include="BooleanReverseToVisibilityHiddenConverter.cs" />
68-
<Compile Include="BooleansOrConverter.cs" />
69-
<Compile Include="BooleanToStringConverter.cs" />
70-
<Compile Include="BooleanToVisibilityCollapsedConverter.cs" />
71-
<Compile Include="BooleanToVisibilityHiddenConverter.cs" />
72-
<Compile Include="Bytes1000ToSizeConverter.cs" />
73-
<Compile Include="Bytes1000ToSpeedConverter.cs" />
74-
<Compile Include="ConnectionStateToRectangleStyleConverter.cs" />
75-
<Compile Include="DNSServerInfoToString.cs" />
76-
<Compile Include="IntGreater1ToBooleanConverter.cs" />
77-
<Compile Include="IntToStringConverter.cs" />
78-
<Compile Include="IntZeroReverseToVisibilityCollapsedConverter.cs" />
79-
<Compile Include="IntZeroToVisibilityCollapsedConverter.cs" />
80-
<Compile Include="IPAddressArrayToStringConverter.cs" />
81-
<Compile Include="IPAddressToStringConverter.cs" />
82-
<Compile Include="ListToStringConverter.cs" />
83-
<Compile Include="LvlChartsBandwidthValueConverter.cs" />
84-
<Compile Include="LvlChartsHeaderConverter.cs" />
85-
<Compile Include="NetworkAuthenticationTypeToHumanReadableStringConverter.cs" />
86-
<Compile Include="NullableDateTimeToStringConverter.cs" />
87-
<Compile Include="NullOrEmptyToBoolConverter.cs" />
88-
<Compile Include="NullOrEmptyToStringConverter.cs" />
89-
<Compile Include="NullToFalseConverter.cs" />
90-
<Compile Include="OperationalStatusToStringConverter.cs" />
91-
<Compile Include="PercentConverter.cs" />
92-
<Compile Include="PhysicalAddressToStringConverter.cs" />
93-
<Compile Include="PingStatusToBooleanConverter.cs" />
94-
<Compile Include="PingTimeToStringConverter.cs" />
95-
<Compile Include="RemoteDesktopAudioCaptureRedirectionModeToStringConverter.cs" />
96-
<Compile Include="RemoteDesktopAudioRedirectionModeToStringConverter.cs" />
97-
<Compile Include="RemoteDesktopKeyboardHookModeToStringConverter.cs" />
98-
<Compile Include="RemoteDesktopNetworkConnectionTypeToStringConverter.cs" />
99-
<Compile Include="SelectedItemsToBooleanConverter.cs" />
100-
<Compile Include="StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter.cs" />
101-
<Compile Include="StringIsNotNullOrEmptyToBooleanConverter.cs" />
102-
<Compile Include="StringIsNotNullOrEmptyToVisibilityCollapsedConverter.cs" />
103-
<Compile Include="TcpStateToStringConverter.cs" />
104-
<Compile Include="TimeSpanToMillisecondConverter.cs" />
105-
<Compile Include="TimeSpanToStringConverter.cs" />
106-
<Compile Include="TimestampToStringConverter.cs" />
107-
<Compile Include="TimeUnitToStringConverter.cs" />
108-
<Compile Include="AccentToStringConverter.cs" />
109-
<Compile Include="ApplicationNameToIconConverter.cs" />
110-
<Compile Include="ApplicationNameToTranslatedStringConverter.cs" />
111-
<Compile Include="AppThemeToBrushConverter.cs" />
112-
<Compile Include="AppThemeToStringConverter.cs" />
113-
<Compile Include="ConnectionStateToStringConverter.cs" />
114-
<Compile Include="AutoRefreshTimeToStringConverter.cs" />
115-
<Compile Include="DiscoveryProtocolToStringConverter.cs" />
116-
<Compile Include="IPStatusToStringConverter.cs" />
117-
<Compile Include="PortStateToStringConverter.cs" />
118-
<Compile Include="Properties\AssemblyInfo.cs" />
119-
<Compile Include="ValidateNetworkInterfaceConfigConverter.cs" />
120-
<Compile Include="ValidateSubnetCalculatorSubnettingConverter.cs" />
121-
<Compile Include="ValidateSubnetCalculatorSupernettingConverter.cs" />
122-
<Compile Include="WiFiChannelAndDBMConverter.cs" />
123-
<Compile Include="WiFiPhyKindConverter.cs" />
124-
</ItemGroup>
125-
<ItemGroup>
126-
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj">
127-
<Project>{FF225C2E-AA67-4B10-939A-6C046CEF8697}</Project>
128-
<Name>NETworkManager.Localization</Name>
129-
</ProjectReference>
130-
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj">
131-
<Project>{8a2859dc-38b6-4e9d-a6b2-1828dc6641b3}</Project>
132-
<Name>NETworkManager.Models</Name>
133-
</ProjectReference>
134-
<ProjectReference Include="..\NETworkManager.Profiles\NETworkManager.Profiles.csproj">
135-
<Project>{D3B37F13-E8E6-4218-9E8E-96D52432A9CF}</Project>
136-
<Name>NETworkManager.Profiles</Name>
137-
</ProjectReference>
138-
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj">
139-
<Project>{954E8703-3E6E-42BF-BD28-F0B19BE10E0C}</Project>
140-
<Name>NETworkManager.Settings</Name>
141-
</ProjectReference>
142-
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj">
143-
<Project>{5c3d1749-d260-4566-b448-b94b3ad9eeff}</Project>
144-
<Name>NETworkManager.Utilities</Name>
145-
</ProjectReference>
18+
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj" />
19+
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
20+
<ProjectReference Include="..\NETworkManager.Profiles\NETworkManager.Profiles.csproj" />
21+
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj" />
22+
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
14623
</ItemGroup>
24+
14725
<ItemGroup>
148-
<PackageReference Include="LiveCharts.Wpf">
149-
<Version>0.9.7</Version>
150-
</PackageReference>
151-
<PackageReference Include="MahApps.Metro">
152-
<Version>1.6.5</Version>
153-
</PackageReference>
26+
<PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
27+
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
15428
</ItemGroup>
155-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
29+
15630
</Project>
Lines changed: 7 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,62 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
73
<ProjectGuid>{95CE4AD5-14C0-4486-9C11-5D6A5EC48176}</ProjectGuid>
84
<OutputType>Library</OutputType>
95
<AppDesignerFolder>Properties</AppDesignerFolder>
106
<RootNamespace>NETworkManager.Documentation</RootNamespace>
117
<AssemblyName>NETworkManager.Documentation</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
8+
<TargetFramework>netcoreapp3.1</TargetFramework>
9+
<UseWPF>true</UseWPF>
10+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2411
<DocumentationFile>bin\Debug\NETworkManager.Documentation.xml</DocumentationFile>
2512
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="System" />
36-
<Reference Include="System.Core" />
37-
<Reference Include="System.Xml.Linq" />
38-
<Reference Include="System.Data.DataSetExtensions" />
39-
<Reference Include="Microsoft.CSharp" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Net.Http" />
42-
<Reference Include="System.Xml" />
43-
</ItemGroup>
4413
<ItemGroup>
45-
<Compile Include="..\GlobalAssemblyInfo.cs">
46-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
47-
</Compile>
48-
<Compile Include="BaseInfo.cs" />
49-
<Compile Include="DocumentationIdentifier.cs" />
50-
<Compile Include="DocumentationInfo.cs" />
51-
<Compile Include="DocumentationManager.cs" />
52-
<Compile Include="ExternalServicesInfo.cs" />
53-
<Compile Include="ExternalServicesManager.cs" />
54-
<Compile Include="LibraryInfo.cs" />
55-
<Compile Include="LibraryManager.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
57-
<Compile Include="ResourceInfo.cs" />
58-
<Compile Include="ResourceManager.cs" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj">
62-
<Project>{ff225c2e-aa67-4b10-939a-6c046cef8697}</Project>
63-
<Name>NETworkManager.Localization</Name>
64-
</ProjectReference>
65-
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj">
66-
<Project>{8a2859dc-38b6-4e9d-a6b2-1828dc6641b3}</Project>
67-
<Name>NETworkManager.Models</Name>
68-
</ProjectReference>
69-
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj">
70-
<Project>{5c3d1749-d260-4566-b448-b94b3ad9eeff}</Project>
71-
<Name>NETworkManager.Utilities</Name>
72-
</ProjectReference>
14+
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj" />
15+
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
16+
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
7317
</ItemGroup>
7418
<ItemGroup>
7519
<Content Include="Licenses\AirspaceFixer.txt">
7620
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7721
</Content>
78-
</ItemGroup>
79-
<ItemGroup>
8022
<Content Include="Licenses\ControlsEx.txt">
8123
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8224
</Content>
83-
</ItemGroup>
84-
<ItemGroup>
8525
<Content Include="Licenses\DnsClient.NET.txt">
8626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8727
</Content>
88-
</ItemGroup>
89-
<ItemGroup>
9028
<Content Include="Licenses\Dragablz.txt">
9129
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9230
</Content>
93-
</ItemGroup>
94-
<ItemGroup>
9531
<Content Include="Licenses\IPNetwork.txt">
9632
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9733
</Content>
98-
</ItemGroup>
99-
<ItemGroup>
10034
<Content Include="Licenses\LiveCharts.txt">
10135
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10236
</Content>
103-
</ItemGroup>
104-
<ItemGroup>
10537
<Content Include="Licenses\LiveCharts.Wpf.txt">
10638
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10739
</Content>
108-
</ItemGroup>
109-
<ItemGroup>
11040
<Content Include="Licenses\LoadingIndicators.WPF.txt">
11141
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11242
</Content>
113-
</ItemGroup>
114-
<ItemGroup>
11543
<Content Include="Licenses\MahApps.Metro.IconPack.txt">
11644
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11745
</Content>
118-
</ItemGroup>
119-
<ItemGroup>
12046
<Content Include="Licenses\MahApps.Metro.txt">
12147
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12248
</Content>
123-
</ItemGroup>
124-
<ItemGroup>
12549
<Content Include="Licenses\NETworkManager.txt">
12650
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12751
</Content>
128-
</ItemGroup>
129-
<ItemGroup>
13052
<Content Include="Licenses\Newtonsoft.Json.txt">
13153
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13254
</Content>
133-
</ItemGroup>
134-
<ItemGroup>
13555
<Content Include="Licenses\Octokit.txt">
13656
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13757
</Content>
138-
</ItemGroup>
139-
<ItemGroup>
14058
<Content Include="Licenses\SharpSnmpLib.txt">
14159
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
14260
</Content>
14361
</ItemGroup>
144-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
14562
</Project>

0 commit comments

Comments
 (0)