Sign with SignPath

Fixes #2472

.github/workflows/build.yml

@@ -0,0 +1,156 @@
+name: Build
+
+permissions:
+  contents: read # Default to secure
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'Src/**'
+      - 'Localization/**'
+      - '.github/workflows/build.yml'
+
+  workflow_dispatch:  # allows manual trigger for main/master
+
+jobs:
+  build:
+    runs-on: windows-2022
+    outputs:
+      new_version: ${{ steps.versioning.outputs.NEW_VERSION }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # Essential to see all tags
+
+      - name: Prepare version
+        id: versioning
+        shell: pwsh
+        run: |
+          # Fetch latest tag
+          $latestTag = git describe --tags --abbrev=0 2>$null
+
+          if ($latestTag -notmatch '^v\d+\.\d+\.\d+$') {
+            Write-Error "Error: Could not find a valid vX.Y.Z tag in history. Found: '$latestTag'"
+            exit 1
+          }
+          
+          # Parse and Increment
+          $version = [version]$latestTag.Substring(1)
+          $baseVersion = "$($version.Major).$($version.Minor).$($version.Build + 1)"
+
+          # Handle PR Suffix
+          if ("${{ github.event_name }}" -eq "pull_request") {
+            $shortSha = "${{ github.event.pull_request.head.sha }}".Substring(0, 7)
+            $finalVersion = "$baseVersion-pr-$shortSha"
+          } else {
+            $finalVersion = $baseVersion
+          }
+          
+          # Export
+          "NEW_VERSION=$finalVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          Write-Host "Building version: $finalVersion"
+
+      - name: Build binaries
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        run: Src\Setup\BuildBinaries.bat
+
+      - name: Upload binaries
+        id: upload-binaries
+        uses: actions/upload-artifact@v7
+        with:
+          name: Binaries
+          path: |
+            Src/Setup/Output/
+            !Src/Setup/Output/*.skin
+            !Src/Setup/Output/*.skin7
+            !Src/Setup/Output/*.zip
+
+      - name: Sign binaries with SignPath
+        uses: signpath/github-action-submit-signing-request@v2
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
+          project-slug: 'Open-Shell-Menu'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Binaries'
+          github-artifact-id: '${{ steps.upload-binaries.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'Src/Setup/Output/'
+
+      - name: Build installers
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        run: Src\Setup\_BuildEnglish.bat
+
+      - name: Upload installers
+        id: upload-installers
+        uses: actions/upload-artifact@v7
+        with:
+          name: MSI
+          path: |
+            Src/Setup/Temp/*.msi
+
+      - name: Sign installers with SignPath
+        uses: signpath/github-action-submit-signing-request@v2
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
+          project-slug: 'Open-Shell-Menu'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Installers'
+          github-artifact-id: '${{ steps.upload-installers.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'Src/Setup/Temp/'
+
+      - name: Build final
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        run: Src\Setup\BuildArchives.bat
+
+      - name: Upload final
+        id: upload-final
+        uses: actions/upload-artifact@v7
+        with:
+          name: Final
+          path: |
+            Src/Setup/Final/
+            !Src/Setup/Final/OpenShellLoc.zip
+
+      - name: Sign final artifacts with SignPath
+        uses: signpath/github-action-submit-signing-request@v2
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
+          project-slug: 'Open-Shell-Menu'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Final'
+          github-artifact-id: '${{ steps.upload-final.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'Src/Setup/Final/'
+
+      - name: Upload final (signed)
+        uses: actions/upload-artifact@v7
+        with:
+          name: Final-signed
+          path: |
+            Src/Setup/Final/
+            !Src/Setup/Final/OpenShellLoc.zip
+
+  release:
+    if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
+    needs: build
+    runs-on: ubuntu-latest # Cheaper/faster than windows for just uploading
+    permissions:
+      contents: write # Elevate permissions ONLY for this job
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: OpenShell

README.md

@@ -7,7 +7,7 @@ A collection of utilities bringing back classic features to Windows.
 
 *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)*
 
-[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)  [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)  [![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)  [![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)  [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)  [![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)
+[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)  [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)  [![Build](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml/badge.svg)](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml)  [![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)  [![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)  [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)  [![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)
 
 [Open-Shell Homepage](https://open-shell.github.io/Open-Shell-Menu)  
 

Src/Setup/BuildArchives.bat

@@ -1,5 +1,145 @@
+@echo off
+set PATH=C:\Program Files\7-Zip\;%PATH%
+cd %~dp0
+
+call _Version.bat
+
+REM ********* Build MSI Checksums
+echo --- MSI Checksums
+..\..\build\bin\Release\Utility.exe crcmsi Temp
+@if ERRORLEVEL 1 exit /b 1
+
+REM ********* Build bootstrapper
+echo --- Bootstrapper
+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\
+
+"%MSBuildDir%MSBuild.exe" Setup.sln /m /t:Rebuild /p:Configuration="Release" /p:Platform="Win32" /verbosity:quiet /nologo
+@if ERRORLEVEL 1 exit /b 1
+
+
+if exist Final rd /Q /S Final
+md Final
+
+copy /B ..\..\build\bin\Release\Setup.exe Final\OpenShellSetup_%CS_VERSION_STR%.exe > nul
+
+if defined APPVEYOR (
+	appveyor PushArtifact Final\OpenShellSetup_%CS_VERSION_STR%.exe
+)
+
 REM ***** Collect PDBs
 
+REM ********* Collect debug info
+md Output\PDB32
+md Output\PDB64
+md Output\PDBARM64
+
+REM Explorer 32
+copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
+copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
+copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
+
+REM Explorer 64
+copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
+
+REM Explorer ARM64
+copy /B ..\..\build\bin\SetupARM64\ClassicExplorer64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicExplorer64.dll Output\PDBARM64 > nul
+
+REM IE 32
+copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
+copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
+copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
+
+REM IE 64
+copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
+
+REM IE ARM64
+copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicIEDLL_64.dll Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\ClassicIE_64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicIE_64.exe Output\PDBARM64 > nul
+
+REM Menu 32
+copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
+copy /B Output\StartMenu.exe Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
+copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
+copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
+copy /B Output\Update.exe Output\PDB32 > nul
+copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
+copy /B Output\DesktopToasts.dll Output\PDB32 > nul
+
+REM Menu 64
+copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
+
+REM Menu ARM64
+copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\StartMenuHelper64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenuHelper64.dll Output\PDBARM64 > nul
+
+REM ********* Source Index PDBs
+
+set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe"
+
+if exist %PDBSTR_PATH% (
+	echo --- Adding source index to PDBs
+	call CreateSourceIndex.bat ..\.. > Output\pdbstr.txt
+
+	for %%f in (Output\PDB32\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+
+	for %%f in (Output\PDB64\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+
+	for %%f in (Output\PDBARM64\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+)
+
+REM ********* Prepare symbols
+
+set SYMSTORE_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe"
+
+%SYMSTORE_PATH% add /r /f Output\PDB32 /s Output\symbols /t OpenShell -:NOREFS > nul
+%SYMSTORE_PATH% add /r /f Output\PDB64 /s Output\symbols /t OpenShell -:NOREFS > nul
+%SYMSTORE_PATH% add /r /f Output\PDBARM64 /s Output\symbols /t OpenShell -:NOREFS > nul
+rd /Q /S Output\symbols\000Admin > nul
+del Output\symbols\pingme.txt > nul
+
+rd /Q /S Output\PDB32
+rd /Q /S Output\PDB64
+rd /Q /S Output\PDBARM64
+
 echo -- Creating symbols package
 set CS_SYMBOLS_NAME=OpenShellSymbols_%CS_VERSION_STR%.7z
 
@@ -20,6 +160,8 @@ cd ..
 
 cd Setup
 
+copy /B ..\..\build\bin\Release\Utility.exe .\Final > nul
+
 if defined APPVEYOR (
 	appveyor PushArtifact ..\..\build\bin\Release\Utility.exe
 )

Src/Setup/BuildBinaries.bat

@@ -1,3 +1,8 @@
+@echo off
+cd %~dp0
+
+call _Version.bat
+
 if exist Output rd /Q /S Output
 md Output
 md Output\x64
@@ -82,119 +87,6 @@ copy /B "..\..\build\bin\Skins\Metallic.skin7" Output > nul
 copy /B "..\..\build\bin\Skins\Immersive.skin" Output > nul
 copy /B "..\..\build\bin\Skins\Immersive.skin7" Output > nul
 
-
-REM ********* Collect debug info
-md Output\PDB32
-md Output\PDB64
-md Output\PDBARM64
-
-REM Explorer 32
-copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
-copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
-copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
-
-REM Explorer 64
-copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
-
-REM Explorer ARM64
-copy /B ..\..\build\bin\SetupARM64\ClassicExplorer64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicExplorer64.dll Output\PDBARM64 > nul
-
-REM IE 32
-copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
-copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
-copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
-
-REM IE 64
-copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
-
-REM IE ARM64
-copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicIEDLL_64.dll Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\ClassicIE_64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicIE_64.exe Output\PDBARM64 > nul
-
-REM Menu 32
-copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
-copy /B Output\StartMenu.exe Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
-copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
-copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
-copy /B Output\Update.exe Output\PDB32 > nul
-copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
-copy /B Output\DesktopToasts.dll Output\PDB32 > nul
-
-REM Menu 64
-copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
-
-REM Menu ARM64
-copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\StartMenuHelper64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenuHelper64.dll Output\PDBARM64 > nul
-
-REM ********* Source Index PDBs
-
-set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe"
-
-if exist %PDBSTR_PATH% (
-	echo --- Adding source index to PDBs
-	call CreateSourceIndex.bat ..\.. > Output\pdbstr.txt
-
-	for %%f in (Output\PDB32\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-
-	for %%f in (Output\PDB64\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-
-	for %%f in (Output\PDBARM64\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-)
-
-REM ********* Prepare symbols
-
-set SYMSTORE_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe"
-
-%SYMSTORE_PATH% add /r /f Output\PDB32 /s Output\symbols /t OpenShell -:NOREFS > nul
-%SYMSTORE_PATH% add /r /f Output\PDB64 /s Output\symbols /t OpenShell -:NOREFS > nul
-%SYMSTORE_PATH% add /r /f Output\PDBARM64 /s Output\symbols /t OpenShell -:NOREFS > nul
-rd /Q /S Output\symbols\000Admin > nul
-del Output\symbols\pingme.txt > nul
-
-rd /Q /S Output\PDB32
-rd /Q /S Output\PDB64
-rd /Q /S Output\PDBARM64
-
 REM ********* Build ADMX
 echo --- ADMX
 if exist Output\PolicyDefinitions.zip (
@@ -209,7 +101,7 @@ cd ..\Localization\English
 @if ERRORLEVEL 1 exit /b 1
 md en-US
 copy /B *.adml en-US > nul
-7z a ..\..\Setup\Output\PolicyDefinitions.zip *.admx en-US\*.adml PolicyDefinitions.rtf > nul
+tar -a -c -f ..\..\Setup\Output\PolicyDefinitions.zip *.admx en-US\*.adml PolicyDefinitions.rtf
 rd /Q /S en-US
 cd ..\..\Setup
 

Src/Setup/BuildInstaller.bat

@@ -1,3 +1,9 @@
+@echo off
+set PATH=C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\WiX Toolset v3.14\bin\;%PATH%
+cd %~dp0
+
+call _Version.bat
+
 REM ********* Build Help
 echo -- Building Installer (%CS_LANG_NAME_SHORT%)
 @setlocal EnableDelayedExpansion
@@ -22,9 +28,6 @@ echo -- Building Installer (%CS_LANG_NAME_SHORT%)
 @if _%CS_LANG_NAME%==_ echo Unrecognized language '%CS_LANG_FOLDER%'
 @if _%CS_LANG_NAME%==_ exit /b 1
 
-SET CS_INSTALLER_NAME=OpenShellSetup_%CS_VERSION_STR%-%CS_LANG_NAME_SHORT%
-if %CS_LANG_NAME_SHORT%==en SET CS_INSTALLER_NAME=OpenShellSetup_%CS_VERSION_STR%
-
 if exist Temp rd /Q /S Temp
 md Temp
 
@@ -66,27 +69,6 @@ candle Setup.wxs -nologo -out Temp\SetupARM64.wixobj -ext WixUIExtension -ext Wi
 light Temp\SetupARM64.wixobj -nologo -out Temp\SetupARM64.msi -ext WixUIExtension -ext WixUtilExtension -loc ..\Localization\%CS_LANG_FOLDER%\OpenShellText-%CS_LANG_NAME%.wxl -loc ..\Localization\%CS_LANG_FOLDER%\WixUI_%CS_LANG_NAME%.wxl -sice:ICE38 -sice:ICE43 -sice:ICE09
 @if ERRORLEVEL 1 exit /b 1
 
-REM ********* Build MSI Checksums
-echo --- MSI Checksums
-..\..\build\bin\Release\Utility.exe crcmsi Temp
-@if ERRORLEVEL 1 exit /b 1
-
-REM ********* Build bootstrapper
-echo --- Bootstrapper
-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\
-
-"%MSBuildDir%MSBuild.exe" Setup.sln /m /t:Rebuild /p:Configuration="Release" /p:Platform="Win32" /verbosity:quiet /nologo
-@if ERRORLEVEL 1 exit /b 1
-
-if exist Final rd /Q /S Final
-md Final
-
-copy /B ..\..\build\bin\Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul
-
-if defined APPVEYOR (
-	appveyor PushArtifact Final\%CS_INSTALLER_NAME%.exe
-)
-
 SET CS_LANG_FOLDER=
 SET CS_LANG_NAME=
 SET CS_LANG_NAME_SHORT=

Src/Setup/Utility/ManualUninstall.cpp

@@ -30,17 +30,17 @@
 #ifdef SAFE_MODE
 #define RegDeleteTree2(x,y) 5
 #define RegDeleteValue2(x,y) 5
-#define DeleteFile2(x) (SetLastError(3), FALSE)
+#define DeleteFile3(x) (SetLastError(3), FALSE)
 #define MoveFileEx2(x,y,z) (SetLastError(5), FALSE)
 #define SHFileOperation2(x) 0x78
-#define RemoveDirectory2(x) FALSE
+#define RemoveDirectory3(x) FALSE
 #else
 #define RegDeleteTree2(x,y) RegDeleteTree(x,y)
 #define RegDeleteValue2(x,y) RegDeleteValue(x,y)
-#define DeleteFile2(x) DeleteFile(x)
+#define DeleteFile3(x) DeleteFile(x)
 #define MoveFileEx2(x,y,z) MoveFileEx(x,y,z)
 #define SHFileOperation2(x) SHFileOperation(x)
-#define RemoveDirectory2(x) RemoveDirectory(x)
+#define RemoveDirectory3(x) RemoveDirectory(x)
 #endif
 
 // files to delete from the Open-Shell folder
@@ -777,7 +777,7 @@ static bool DeleteFileEx( const wchar_t *fname, bool bAllowDelay )
 		if (attribs&FILE_ATTRIBUTE_READONLY)
 			SetFileAttributes(fname,attribs&~FILE_ATTRIBUTE_READONLY);
 		LogMessage(-1,L"Deleting file %s",fname);
-		if (!DeleteFile2(fname))
+		if (!DeleteFile3(fname))
 		{
 			int error=GetLastError();
 			if (error==ERROR_ACCESS_DENIED && bAllowDelay)
@@ -826,7 +826,7 @@ static void DeleteDirectoryEx( const wchar_t *path, bool bDelay )
 	else
 	{
 		LogMessage(-1,L"Deleting directory %s",path);
-		if (!RemoveDirectory2(path))
+		if (!RemoveDirectory3(path))
 		{
 			int error=GetLastError();
 			bool bOldHasErrors=g_bHasErrors;

Src/Setup/_BuildEnglish.bat

@@ -1,3 +1,6 @@
+@echo off
+cd %~dp0
+
 SET CS_LANG_FOLDER=English
 SET CS_LANG_NAME=en-US
 SET CS_LANG_NAME_SHORT=en

Src/Setup/_Version.bat

@@ -0,0 +1,9 @@
+@echo off
+
+rem Convert . to _
+set CS_VERSION_STR=%CS_VERSION:.=_%
+
+set CS_VERSION_ORIG=%CS_VERSION%
+
+rem Strip optional "-xyz" suffix from version
+for /f "delims=- tokens=1,1" %%i in ("%CS_VERSION%") do set CS_VERSION=%%i

Src/StartMenu/StartMenuDLL/ItemManager.h

@@ -383,7 +383,7 @@ private:
 	static DWORD CALLBACK StaticRefreshInfoThread( void *param );
 	static DWORD CALLBACK SaveCacheFileThread( void *param );
 
-	// all paths are in caps and end with \ 
+	// all paths are in caps and end with backslash
 	CString m_RootStartMenu1;
 	CString m_RootStartMenu2;
 	CString m_RootStartMenu3;

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

@@ -1081,9 +1081,9 @@ BEGIN
     IDS_RIGHT_SHIFT_TIP     "When this is checked, right-click on the start button will open the standard Windows context menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
     IDS_RIGHT_SHIFTX        "Right click opens Win+X menu"
     IDS_RIGHT_SHIFTX_TIP    "When this is checked, right-click on the start button will open the Win+X power menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
-    IDS_STARTSCREEN_ITEM    "Show Start screen shortcut"
+    IDS_STARTSCREEN_ITEM    "Show Start Menu/Screen shortcut"
     IDS_STARTSCREEN_ITEM_TIP 
-                            "When this is checked, the main menu will contain a shortcut to open the Start screen"
+                            "When this is checked, the main menu will contain a shortcut to open original Start menu/screen"
     IDS_MIN_HEIGHT          "Minimum menu height"
     IDS_MIN_HEIGHT_TIP      "The main menu will be at least as tall as this many search results"
     IDS_GLASS_OVERRIDE      "Override glass color"

Src/StartMenu/StartMenuHelper/StartMenuExt.h

@@ -55,8 +55,8 @@ END_COM_MAP()
 	STDMETHODIMP InvokeCommand( CMINVOKECOMMANDINFO *pInfo );
 	STDMETHODIMP GetCommandString( UINT_PTR idCmd, UINT uFlags, UINT* pwReserved, LPSTR pszName, UINT cchMax );
 
-	wchar_t m_PinFolder1[_MAX_PATH]; // ending with \ 
+	wchar_t m_PinFolder1[_MAX_PATH]; // ending with backslash
-	wchar_t m_PinFolder2[_MAX_PATH]; // ending with \ 
+	wchar_t m_PinFolder2[_MAX_PATH]; // ending with backslash
 	wchar_t m_FileName[_MAX_PATH];
 	LPITEMIDLIST m_FilePidl;
 	bool m_bInPinFolder1, m_bInPinFolder2;