Skip to content

Commit eaf1fbe

Browse files
aitenaiten
committed
migrate to core/net 5.0
migrate to core/net 5.0
1 parent 549c93a commit eaf1fbe

File tree

24 files changed

+47
-95
lines changed

24 files changed

+47
-95
lines changed

‎Arduino/Arduino.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
7-
<PackageReference Include="System.IO.Ports" Version="4.7.0" />
6+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
7+
<PackageReference Include="System.IO.Ports" Version="5.0.0" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\Pattern\Pattern.csproj" />

‎CsvImport/CsvImport.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎Dependency/Dependency.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<Compile Remove="Abstraction\**" />
77
<EmbeddedResource Remove="Abstraction\**" />
88
<None Remove="Abstraction\**" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
1212
</ItemGroup>
1313
</Project>

‎Directory.Build.props

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
<PropertyGroup Label="Versioning">
44
<Authors>Herbert Aitenbichler</Authors>
55
<Company>Herbert Aitenbichler</Company>
6-
<VersionPrefix>1.3.0</VersionPrefix>
6+
<VersionPrefix>1.4.0</VersionPrefix>
77
<Copyright>Herbert Aitenbichler</Copyright>
88
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
99
</PropertyGroup>
1010

1111
<PropertyGroup Label="Custom Variables">
1212
<SolutionNamespace>Framework</SolutionNamespace>
13-
<TargetFrameworkForProjects>netcoreapp3.1</TargetFrameworkForProjects>
14-
<TargetFrameworkForAppAndTests>netcoreapp3.1</TargetFrameworkForAppAndTests>
15-
<TargetFrameworkForFull>netcoreapp3.1</TargetFrameworkForFull>
13+
14+
<TargetFrameworkForProject>net5.0</TargetFrameworkForProject>
15+
<TargetFrameworkForApp>net5.0</TargetFrameworkForApp>
16+
<TargetFrameworkForUnitTest>net5.0</TargetFrameworkForUnitTest>
17+
<TargetFrameworkForWpf>net5.0-windows</TargetFrameworkForWpf>
18+
1619
</PropertyGroup>
1720

1821
<PropertyGroup Label="Compiler Settings">

‎Drawing/Drawing.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
6+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
77
</ItemGroup>
88
</Project>

‎Localization/Localization.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<Compile Update="ErrorMessages.Designer.cs">

‎Logic.Abstraction/Logic.Abstraction.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="AutoMapper" Version="10.1.1" />

‎Logic/Logic.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\Dependency\Dependency.csproj" />

‎MyUnitTest/MyUnitTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net5.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="FluentAssertions" Version="5.10.3" />
77
<PackageReference Include="NSubstitute" Version="4.2.2" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
99
<PackageReference Include="NLog" Version="4.7.5" />
10-
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
10+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>

‎Parser/Parser.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎Pattern/Pattern.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\Dependency\Dependency.csproj" />

‎Repository.Abstraction/Repository.Abstraction.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎Repository/Repository.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
7-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.9" />
6+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
7+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\CsvImport\CsvImport.csproj" />

‎Schedule/Schedule.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
6+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
77
</ItemGroup>
88
<ItemGroup>
99
<ProjectReference Include="..\Tools\Tools.csproj" />

‎Service.Abstraction/Service.Abstraction.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="AutoMapper" Version="10.1.1" />

‎Service.Logic/Service.Logic.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\Logic.Abstraction\Logic.Abstraction.csproj" />

‎Service.WebAPI/Service.WebAPI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />

‎Tools/Tools.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\Dependency\Dependency.csproj" />

‎UnitTest/UnitTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForAppAndTests)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForUnitTest)</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="FluentAssertions" Version="5.10.3" />

‎WebAPI.Host/ProgramUtilities.cs

+6-57
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,8 @@ The above copyright notice and this permission notice shall be included in all c
1717
namespace Framework.WebAPI.Host
1818
{
1919
using System;
20-
using System.Diagnostics;
2120
using System.IO;
2221
using System.Reflection;
23-
using System.Runtime.InteropServices;
24-
using System.ServiceProcess;
25-
26-
using Framework.WinAPI;
2722

2823
using Microsoft.Extensions.Hosting;
2924

@@ -35,59 +30,13 @@ public static class ProgramUtilities
3530

3631
public static void StartWebService(string[] args, Func<string[], IHostBuilder> buildHost)
3732
{
38-
if (RunsAsService())
39-
{
40-
Environment.CurrentDirectory = BaseDirectory;
41-
ServiceBase.Run(new ServiceBase[] { new WebAPiService() { HostBuilder = buildHost } });
42-
}
43-
else
44-
{
45-
buildHost(args).Build().Run();
46-
LogManager.Shutdown();
47-
}
48-
}
49-
50-
public static bool RunsAsService()
51-
{
52-
var commandline = System.Environment.CommandLine;
53-
54-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Microsoft.Azure.Web.DataProtection.Util.IsAzureEnvironment() == false)
55-
{
56-
if (IsUnderIisExpress())
57-
{
58-
return false;
59-
}
60-
61-
return WinAPIWrapper.CheckForConsoleWindow() && IsUnderWindowsServiceManager();
62-
}
63-
64-
return false; // never can be a windows service
65-
}
66-
67-
public static bool IsUnderIisExpress()
68-
{
69-
var currentProcess = Process.GetCurrentProcess();
70-
if (string.CompareOrdinal(currentProcess.ProcessName, @"iisexpress") == 0)
71-
{
72-
return true;
73-
}
74-
75-
var parentProcess = currentProcess.Parent();
76-
if (parentProcess != null &&
77-
(string.CompareOrdinal(parentProcess.ProcessName, @"iisexpress") == 0 ||
78-
string.CompareOrdinal(parentProcess.ProcessName, @"VSIISExeLauncher") == 0))
79-
{
80-
return true;
81-
}
33+
Environment.CurrentDirectory = BaseDirectory;
8234

83-
return false;
84-
}
85-
86-
public static bool IsUnderWindowsServiceManager()
87-
{
88-
var currentProcess = Process.GetCurrentProcess();
89-
var parentProcess = currentProcess.Parent();
90-
return (parentProcess != null && parentProcess.ProcessName == @"services");
35+
var host = buildHost(args);
36+
host.UseWindowsService();
37+
38+
host.Build().Run();
39+
LogManager.Shutdown();
9140
}
9241
}
9342
}

‎WebAPI.Host/WebAPI.Host.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
<OutputType>Library</OutputType>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.1" />
8-
<PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="0.1.78-alpha" />
7+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
98
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
109
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
1110
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.0" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\WinAPI\WinAPI.csproj" />

‎WebAPI/WebAPI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
<OutputType>Library</OutputType>
55
</PropertyGroup>
66
<ItemGroup>

‎WinAPI/WinAPI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkForProjects)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkForProject)</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎Wpf/Wpf.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
3+
<Project Sdk="Microsoft.NET.Sdk">
44

55
<PropertyGroup>
6-
<TargetFramework>$(TargetFrameworkForFull)</TargetFramework>
6+
<TargetFramework>$(TargetFrameworkForWpf)</TargetFramework>
77
<UseWPF>true</UseWPF>
88
</PropertyGroup>
99

0 commit comments

Comments
 (0)