From 7178fbbaa1d2e7563a1dac57d0e00048a32af440 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Fri, 20 Aug 2021 23:41:44 +0200 Subject: [PATCH] Update copyright, packages and Windows versions (#23) * Update copyright, packages and Windows versions * Add Windows Server 2022 * Bump the version --- NorthwoodLib.Tests/NorthwoodLib.Tests.csproj | 4 ++-- NorthwoodLib/NorthwoodLib.csproj | 2 +- NorthwoodLib/OperatingSystem.cs | 8 ++++++-- NorthwoodLib/PlatformSettings.cs | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj b/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj index 5fe6cce..20f3644 100644 --- a/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj +++ b/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj @@ -10,13 +10,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NorthwoodLib/NorthwoodLib.csproj b/NorthwoodLib/NorthwoodLib.csproj index 611b3f2..c9e8ba0 100644 --- a/NorthwoodLib/NorthwoodLib.csproj +++ b/NorthwoodLib/NorthwoodLib.csproj @@ -12,7 +12,7 @@ NorthwoodLib Hubert Moszka Northwood Hubert Moszka Northwood - Hubert Moszka Northwood, 2020 + Hubert Moszka Northwood, 2020-2021 diff --git a/NorthwoodLib/OperatingSystem.cs b/NorthwoodLib/OperatingSystem.cs index 217a825..f5e338e 100644 --- a/NorthwoodLib/OperatingSystem.cs +++ b/NorthwoodLib/OperatingSystem.cs @@ -348,6 +348,7 @@ private static string ProcessWindowsVersion(Version version, bool server) case 10: switch (version.Minor) { + case 0 when version.Build >= 20348: return "Server 2022"; case 0 when version.Build >= 17677: return "Server 2019"; case 0: return "Server 2016"; } @@ -399,8 +400,11 @@ private static string ProcessWindowsVersion(Version version, bool server) case 0 when version.Build == 18363: return "10 1909"; case 0 when version.Build == 19041: return "10 2004"; case 0 when version.Build == 19042: return "10 20H2"; - case 0 when version.Build > 19042: return "10 Dev Channel"; - case 0: return "10 Preview"; + case 0 when version.Build == 19043: return "10 21H1"; + case 0 when version.Build == 19044: return "10 21H2"; + case 0 when version.Build == 22000: return "11"; + case 0 when version.Build < 22000: return "10 Preview"; + case 0: return "11 Dev Channel"; } break; diff --git a/NorthwoodLib/PlatformSettings.cs b/NorthwoodLib/PlatformSettings.cs index 3e6fe1c..14d1a2b 100644 --- a/NorthwoodLib/PlatformSettings.cs +++ b/NorthwoodLib/PlatformSettings.cs @@ -11,7 +11,7 @@ public static class PlatformSettings /// /// Current library version /// - internal const string VersionConst = "1.2.0"; + internal const string VersionConst = "1.2.1"; /// /// Returns the library version