Skip to content

Commit

Permalink
Merge pull request chocolatey#3143 from vexx32/update-supported-winver
Browse files Browse the repository at this point in the history
(chocolatey#2903) Update minimum supported OS
  • Loading branch information
corbob authored May 10, 2023
2 parents b6b046a + 2da5fc3 commit a716ece
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions src/chocolatey.console/choco.exe.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 0 additions & 12 deletions src/chocolatey/infrastructure/platforms/Platform.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a716ece

Please sign in to comment.