Added support for Windows 11 for GetWindowsVersion() method (#273)

Leo-Corporation · Dec 3, 2021 · da39e3a · da39e3a
1 parent f95a2c2
commit da39e3a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/LeoCorpLibrary.Core/Env.cs b/LeoCorpLibrary.Core/Env.cs
@@ -264,22 +264,26 @@ public static WindowsVersion GetWindowsVersion()
 			WindowsVersion res = WindowsVersion.Unknown; // Résultat
 			switch (Environment.OSVersion.Version.Major)
 			{
-				case 6: // Si la version majeure est 6
+				case 6: // If major version is 6
 					switch (Environment.OSVersion.Version.Minor)
 					{
-						case 1: // Si Windows 7 (6.1)
+						case 1: // If Windows 7 (6.1)
 							res = WindowsVersion.Windows7; // Windows 7
 							break;
-						case 2: // Si Windows 8 (6.2)
+						case 2: // If Windows 8 (6.2)
 							res = WindowsVersion.Windows8; // Windows 8
 							break;
-						case 3: // Si Windows 8.1 (6.3)
+						case 3: // If Windows 8.1 (6.3)
 							res = WindowsVersion.Windows81; // Windows 8.1
 							break;
 					}
 					break;
-				case 10: // Si Windows 10
+				case 10: // If Windows 10/11 (NT 10.0)
 					res = WindowsVersion.Windows10; // Windows 10
+					if (Environment.OSVersion.Version.Build >= 22000)
+					{
+						res = WindowsVersion.Windows11; // Windows 11
+					}
 					break;
 			}
 			return res;
@@ -586,18 +590,27 @@ public enum WindowsVersion
 		/// Windows 7 (Version 6.1).
 		/// </summary>
 		Windows7,
+
 		/// <summary>
 		/// Windows 8 (Version 6.2).
 		/// </summary>
 		Windows8,
+
 		/// <summary>
 		/// Windows 8.1 (Version 6.3).
 		/// </summary>
 		Windows81,
+
 		/// <summary>
-		/// Windows 10 (Version 10.0)
+		/// Windows 10 (Version 10.0).
 		/// </summary>
 		Windows10,
+
+		/// <summary>
+		/// Windows 11 (Version 10.0.22XXX+).
+		/// </summary>
+		Windows11,
+
 		/// <summary>
 		/// Unknown operating system.
 		/// </summary>

diff --git a/LeoCorpLibrary/Env.cs b/LeoCorpLibrary/Env.cs
@@ -262,22 +262,26 @@ public static WindowsVersion GetWindowsVersion()
 			WindowsVersion res = WindowsVersion.Unknown; // Résultat
 			switch (Environment.OSVersion.Version.Major)
 			{
-				case 6: // Si la version majeure est 6
+				case 6: // If major version is 6
 					switch (Environment.OSVersion.Version.Minor)
 					{
-						case 1: // Si Windows 7 (6.1)
+						case 1: // If Windows 7 (6.1)
 							res = WindowsVersion.Windows7; // Windows 7
 							break;
-						case 2: // Si Windows 8 (6.2)
+						case 2: // If Windows 8 (6.2)
 							res = WindowsVersion.Windows8; // Windows 8
 							break;
-						case 3: // Si Windows 8.1 (6.3)
+						case 3: // If Windows 8.1 (6.3)
 							res = WindowsVersion.Windows81; // Windows 8.1
 							break;
 					}
 					break;
-				case 10: // Si Windows 10
+				case 10: // If Windows 10/11 (NT 10.0)
 					res = WindowsVersion.Windows10; // Windows 10
+					if (Environment.OSVersion.Version.Build >= 22000)
+					{
+						res = WindowsVersion.Windows11; // Windows 11
+					}
 					break;
 			}
 			return res;
@@ -601,18 +605,27 @@ public enum WindowsVersion
 		/// Windows 7 (Version 6.1).
 		/// </summary>
 		Windows7,
+
 		/// <summary>
 		/// Windows 8 (Version 6.2).
 		/// </summary>
 		Windows8,
+
 		/// <summary>
 		/// Windows 8.1 (Version 6.3).
 		/// </summary>
 		Windows81,
+
 		/// <summary>
-		/// Windows 10 (Version 10.0)
+		/// Windows 10 (Version 10.0).
 		/// </summary>
 		Windows10,
+
+		/// <summary>
+		/// Windows 11 (Version 10.0.22XXX+).
+		/// </summary>
+		Windows11,
+
 		/// <summary>
 		/// Unknown operating system.
 		/// </summary>