From c08058bac6494c66ba42b3066a9247531458f0a0 Mon Sep 17 00:00:00 2001
From: Rain Sallow <rain@chocolatey.io>
Date: Fri, 28 Apr 2023 14:02:43 -0400
Subject: [PATCH] (#2903) Update mininum support OS

Update docs and templates referring to OSes, and application manifest to
put 2008r2 as the minimum supported OS.
---
 README.md                                            |  6 ++++--
 src/chocolatey.console/choco.exe.manifest            |  2 --
 .../templates/ChocolateyReadMeTemplate.cs            |  2 +-
 src/chocolatey/infrastructure/platforms/Platform.cs  | 12 ------------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index dcecf8a2a8..ef882edff2 100644
--- a/README.md
+++ b/README.md
@@ -75,9 +75,11 @@ Please see the [docs](https://docs.chocolatey.org/en-us/)
 Give `choco.exe -?` a shot (or `choco.exe -h`). For specific commands, add the command and then the help switch e.g. `choco.exe install -h`.
 
 ### Requirements
-* .NET Framework 4.0+
+
+* .NET Framework 4.8+
 * PowerShell 2.0+
-* Windows Server 2003+ / Windows 7+
+* Windows Server 2008 R2+ / Windows 10+
+  - See our documentation on the [support lifecycle and supported operating systems](https://docs.chocolatey.org/en-us/information/support-lifecycle) for additional information
 
 ### License / Credits
 Apache 2.0 - see [LICENSE](https://github.com/chocolatey/choco/blob/master/LICENSE) and [NOTICE](https://github.com/chocolatey/choco/blob/master/NOTICE) files.
diff --git a/src/chocolatey.console/choco.exe.manifest b/src/chocolatey.console/choco.exe.manifest
index 4280fcb07b..c1092e653c 100644
--- a/src/chocolatey.console/choco.exe.manifest
+++ b/src/chocolatey.console/choco.exe.manifest
@@ -48,8 +48,6 @@
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
       <!-- Windows 7 / Windows Server 2008 R2 -->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-      <!-- Windows Vista / Windows Server 2008 -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
     </application>
   </compatibility>
 
diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
index 4e87b2ef1b..7dac594a22 100644
--- a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
+++ b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
@@ -94,7 +94,7 @@ Chocolatey makes a number of environment variables available (You can access any
  * CHOCOLATEY_VERSION - The version of Choco you normally see. Use if you are 'lighting' things up based on choco version. Otherwise take a dependency on the specific version you need.
  * ChocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. Automatically handled in built in Choco functions.
  * OS_PLATFORM - Like Windows, macOS, Linux.
- * OS_VERSION - The version of OS, like 6.1 something something for Windows.
+ * OS_VERSION - The version of OS, like 10.0 something something for Windows.
  * OS_NAME - The reported name of the OS.
  * USER_NAME = The user name
  * USER_DOMAIN = The user domain name (could also be local computer name)
diff --git a/src/chocolatey/infrastructure/platforms/Platform.cs b/src/chocolatey/infrastructure/platforms/Platform.cs
index b6cec9b407..af181cce66 100644
--- a/src/chocolatey/infrastructure/platforms/Platform.cs
+++ b/src/chocolatey/infrastructure/platforms/Platform.cs
@@ -134,18 +134,6 @@ private static string GetWindowsVersionName(Version version)
                 case "6.1":
                     name = isServer ? "Windows Server 2008 R2" : "Windows 7";
                     break;
-                case "6.0":
-                    name = isServer ? "Windows Server 2008" : "Windows Vista";
-                    break;
-                case "5.2":
-                    name = isServer ? "Windows Server 2003" : "Windows XP";
-                    break;
-                case "5.1":
-                    name = "Windows XP";
-                    break;
-                case "5.0":
-                    name = "Windows 2000";
-                    break;
             }
 
             return name;