From 9a274c1297139db3f9310e9b3b8dff1af3d12800 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 19 Jul 2026 10:59:58 +0200 Subject: [PATCH 1/2] Revert "Use VS2026" This reverts commit 8502d4bd7b44cf2bbdde667f6447c690f47c299f. VS2026 dropped support for Windows 7. Most of binaries produced by VS2026 don't work on Win7 because the use API that doesn't exist on Win7. --- .github/workflows/build.yml | 2 +- Src/BUILDME.txt | 2 +- Src/OpenShell.sln | 4 ++-- Src/Setup/BuildBinaries.bat | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d30ef77cb..6ceb537d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: windows-2025-vs2026 + runs-on: windows-2022 outputs: new_version: ${{ steps.versioning.outputs.NEW_VERSION }} steps: diff --git a/Src/BUILDME.txt b/Src/BUILDME.txt index d4b2fa347..b9ed47e5b 100644 --- a/Src/BUILDME.txt +++ b/Src/BUILDME.txt @@ -5,7 +5,7 @@ for other languages. The final files (installers, archives) are saved to the Setup\Final folder. You need the following tools: -Visual Studio 2026 (Community Edition is enough) +Visual Studio 2022 (Community Edition is enough) - Desktop development with C++ workload - Windows 11 SDK (10.0.22621.0) for Desktop C++ - Visual C++ ATL support diff --git a/Src/OpenShell.sln b/Src/OpenShell.sln index 6944fab2f..c53d1eb2f 100644 --- a/Src/OpenShell.sln +++ b/Src/OpenShell.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.6.11806.211 stable +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8-C0DB-4991-AF03-124128EDEF98}" EndProject diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index 6811cad06..d375c7666 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -8,8 +8,6 @@ md Output md Output\x64 md Output\ARM64 -"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationName - echo -- Compiling for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\ From 97bae48048b15c800b09b776ad548c083ac3d562 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 19 Jul 2026 11:09:29 +0200 Subject: [PATCH 2/2] Use VS2022 toolset (due to Win7 support) VS2022 is the last VS that does support Windows 7. It seems we have some Win7 users, so for now we will use this toolset to make sure binaries are compatible with Win7. --- Src/ClassicExplorer/ClassicExplorer.vcxproj | 2 +- .../ClassicExplorerSettings/ClassicExplorerSettings.vcxproj | 2 +- Src/ClassicIE/ClassicIE.vcxproj | 2 +- Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj | 2 +- Src/Lib/Lib.vcxproj | 2 +- Src/Setup/Setup.vcxproj | 2 +- Src/Setup/SetupHelper/SetupHelper.vcxproj | 2 +- Src/Setup/Utility/Utility.vcxproj | 2 +- Src/Setup/en-US/en-US.vcxproj | 2 +- Src/Skins/ClassicSkin/ClassicSkin.vcxproj | 2 +- Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj | 2 +- Src/Skins/FullGlass/FullGlass.vcxproj | 2 +- Src/Skins/Immersive/Immersive.vcxproj | 2 +- Src/Skins/Immersive7/Immersive7.vcxproj | 2 +- Src/Skins/Metallic7/Metallic7.vcxproj | 2 +- Src/Skins/Metro/Metro.vcxproj | 2 +- Src/Skins/Metro7/Metro7.vcxproj | 2 +- Src/Skins/Midnight7/Midnight7.vcxproj | 2 +- Src/Skins/SmokedGlass/SmokedGlass.vcxproj | 2 +- Src/Skins/Win7Aero/Win7Aero.vcxproj | 2 +- Src/Skins/Win7Aero7/Win7Aero7.vcxproj | 2 +- Src/Skins/Win7Basic/Win7Basic.vcxproj | 2 +- Src/Skins/Win8/Win8.vcxproj | 2 +- Src/Skins/Win87/Win87.vcxproj | 2 +- Src/Skins/WinXP/WinXP.vcxproj | 2 +- Src/StartMenu/StartMenu.vcxproj | 2 +- Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj | 2 +- Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj | 2 +- Src/Update/DesktopToasts/DesktopToasts.vcxproj | 2 +- Src/Update/Update.vcxproj | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index 2ec90585b..20faa958e 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -59,7 +59,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj index 592247fb7..1ebf5ecb1 100644 --- a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj @@ -23,7 +23,7 @@ Application - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/ClassicIE/ClassicIE.vcxproj b/Src/ClassicIE/ClassicIE.vcxproj index 83f8308ba..c883b879a 100644 --- a/Src/ClassicIE/ClassicIE.vcxproj +++ b/Src/ClassicIE/ClassicIE.vcxproj @@ -47,7 +47,7 @@ Application - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj index 10ea42734..4944070e7 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -59,7 +59,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/Lib/Lib.vcxproj b/Src/Lib/Lib.vcxproj index 8c29ee77c..03954dade 100644 --- a/Src/Lib/Lib.vcxproj +++ b/Src/Lib/Lib.vcxproj @@ -43,7 +43,7 @@ StaticLibrary - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/Setup/Setup.vcxproj b/Src/Setup/Setup.vcxproj index 090492dce..f937d143f 100644 --- a/Src/Setup/Setup.vcxproj +++ b/Src/Setup/Setup.vcxproj @@ -19,7 +19,7 @@ Application - $(DefaultPlatformToolset) + v143 Unicode true diff --git a/Src/Setup/SetupHelper/SetupHelper.vcxproj b/Src/Setup/SetupHelper/SetupHelper.vcxproj index 4b5e328d2..21afa7d9a 100644 --- a/Src/Setup/SetupHelper/SetupHelper.vcxproj +++ b/Src/Setup/SetupHelper/SetupHelper.vcxproj @@ -19,7 +19,7 @@ Application - $(DefaultPlatformToolset) + v143 Unicode true diff --git a/Src/Setup/Utility/Utility.vcxproj b/Src/Setup/Utility/Utility.vcxproj index 744de02c8..ba3c5ad49 100644 --- a/Src/Setup/Utility/Utility.vcxproj +++ b/Src/Setup/Utility/Utility.vcxproj @@ -35,7 +35,7 @@ Application - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/Setup/en-US/en-US.vcxproj b/Src/Setup/en-US/en-US.vcxproj index 4c16e2d32..235ec9dc3 100644 --- a/Src/Setup/en-US/en-US.vcxproj +++ b/Src/Setup/en-US/en-US.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/ClassicSkin/ClassicSkin.vcxproj b/Src/Skins/ClassicSkin/ClassicSkin.vcxproj index 4bad04b5e..695405b96 100644 --- a/Src/Skins/ClassicSkin/ClassicSkin.vcxproj +++ b/Src/Skins/ClassicSkin/ClassicSkin.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj b/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj index d4894296a..5877c621c 100644 --- a/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj +++ b/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/FullGlass/FullGlass.vcxproj b/Src/Skins/FullGlass/FullGlass.vcxproj index 2fcb42a80..1339fb114 100644 --- a/Src/Skins/FullGlass/FullGlass.vcxproj +++ b/Src/Skins/FullGlass/FullGlass.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Immersive/Immersive.vcxproj b/Src/Skins/Immersive/Immersive.vcxproj index 1c2baacab..d3d17b969 100644 --- a/Src/Skins/Immersive/Immersive.vcxproj +++ b/Src/Skins/Immersive/Immersive.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Immersive7/Immersive7.vcxproj b/Src/Skins/Immersive7/Immersive7.vcxproj index d2241fabd..17ac64983 100644 --- a/Src/Skins/Immersive7/Immersive7.vcxproj +++ b/Src/Skins/Immersive7/Immersive7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Metallic7/Metallic7.vcxproj b/Src/Skins/Metallic7/Metallic7.vcxproj index 056b04cc8..b58e9d15b 100644 --- a/Src/Skins/Metallic7/Metallic7.vcxproj +++ b/Src/Skins/Metallic7/Metallic7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Metro/Metro.vcxproj b/Src/Skins/Metro/Metro.vcxproj index 566760539..7028f5689 100644 --- a/Src/Skins/Metro/Metro.vcxproj +++ b/Src/Skins/Metro/Metro.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Metro7/Metro7.vcxproj b/Src/Skins/Metro7/Metro7.vcxproj index ef367e9f2..42575ab62 100644 --- a/Src/Skins/Metro7/Metro7.vcxproj +++ b/Src/Skins/Metro7/Metro7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Midnight7/Midnight7.vcxproj b/Src/Skins/Midnight7/Midnight7.vcxproj index de13b5b0d..481e62396 100644 --- a/Src/Skins/Midnight7/Midnight7.vcxproj +++ b/Src/Skins/Midnight7/Midnight7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/SmokedGlass/SmokedGlass.vcxproj b/Src/Skins/SmokedGlass/SmokedGlass.vcxproj index 13b8806a5..c00b9b276 100644 --- a/Src/Skins/SmokedGlass/SmokedGlass.vcxproj +++ b/Src/Skins/SmokedGlass/SmokedGlass.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Win7Aero/Win7Aero.vcxproj b/Src/Skins/Win7Aero/Win7Aero.vcxproj index 26c74a44a..78038a833 100644 --- a/Src/Skins/Win7Aero/Win7Aero.vcxproj +++ b/Src/Skins/Win7Aero/Win7Aero.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Win7Aero7/Win7Aero7.vcxproj b/Src/Skins/Win7Aero7/Win7Aero7.vcxproj index 095805b4f..8aa65f752 100644 --- a/Src/Skins/Win7Aero7/Win7Aero7.vcxproj +++ b/Src/Skins/Win7Aero7/Win7Aero7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Win7Basic/Win7Basic.vcxproj b/Src/Skins/Win7Basic/Win7Basic.vcxproj index 5ee2fc598..d80072d71 100644 --- a/Src/Skins/Win7Basic/Win7Basic.vcxproj +++ b/Src/Skins/Win7Basic/Win7Basic.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Win8/Win8.vcxproj b/Src/Skins/Win8/Win8.vcxproj index 7928d8651..c3fbbe0a8 100644 --- a/Src/Skins/Win8/Win8.vcxproj +++ b/Src/Skins/Win8/Win8.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/Win87/Win87.vcxproj b/Src/Skins/Win87/Win87.vcxproj index 1becc0f77..c2d326ab8 100644 --- a/Src/Skins/Win87/Win87.vcxproj +++ b/Src/Skins/Win87/Win87.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/Skins/WinXP/WinXP.vcxproj b/Src/Skins/WinXP/WinXP.vcxproj index e790f9629..4ffed1547 100644 --- a/Src/Skins/WinXP/WinXP.vcxproj +++ b/Src/Skins/WinXP/WinXP.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode diff --git a/Src/StartMenu/StartMenu.vcxproj b/Src/StartMenu/StartMenu.vcxproj index 96d346e4c..4605e11f7 100644 --- a/Src/StartMenu/StartMenu.vcxproj +++ b/Src/StartMenu/StartMenu.vcxproj @@ -47,7 +47,7 @@ Application - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj index b60797b41..0412e588c 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj @@ -47,7 +47,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index 363990fba..3e7790656 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -59,7 +59,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Static Unicode true diff --git a/Src/Update/DesktopToasts/DesktopToasts.vcxproj b/Src/Update/DesktopToasts/DesktopToasts.vcxproj index a68cbab4a..5561e5bfc 100644 --- a/Src/Update/DesktopToasts/DesktopToasts.vcxproj +++ b/Src/Update/DesktopToasts/DesktopToasts.vcxproj @@ -20,7 +20,7 @@ DynamicLibrary - $(DefaultPlatformToolset) + v143 Unicode true diff --git a/Src/Update/Update.vcxproj b/Src/Update/Update.vcxproj index 89e3d4579..52f961ac1 100644 --- a/Src/Update/Update.vcxproj +++ b/Src/Update/Update.vcxproj @@ -19,7 +19,7 @@ Application - $(DefaultPlatformToolset) + v143 Static Unicode true