Update copyright, packages and Windows versions (#23)

* Update copyright, packages and Windows versions * Add Windows Server 2022 * Bump the version
northwood-studios · Aug 20, 2021 · 7178fbb · 7178fbb
1 parent 3b9e1c2
commit 7178fbb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj b/NorthwoodLib.Tests/NorthwoodLib.Tests.csproj
@@ -10,13 +10,13 @@
 		<ProjectReference Include="..\NorthwoodLib\NorthwoodLib.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="1.3.0">
+		<PackageReference Include="coverlet.collector" Version="3.1.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/NorthwoodLib/NorthwoodLib.csproj b/NorthwoodLib/NorthwoodLib.csproj
@@ -12,7 +12,7 @@
 		<Description>NorthwoodLib</Description>
 		<Company>Hubert Moszka Northwood</Company>
 		<Authors>Hubert Moszka Northwood</Authors>
-		<Copyright>Hubert Moszka Northwood, 2020</Copyright>
+		<Copyright>Hubert Moszka Northwood, 2020-2021</Copyright>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git 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
@@ -11,7 +11,7 @@ public static class PlatformSettings
 		/// <summary>
 		/// Current library version
 		/// </summary>
-		internal const string VersionConst = "1.2.0";
+		internal const string VersionConst = "1.2.1";
 
 		/// <summary>
 		/// Returns the library version