Merge pull request #26023 from l0rd/win-installer-remove-provider-check

Remove providers checks from the Windows Installer

Author: openshift-merge-bot[bot]

build_windows.md

@@ -11,7 +11,6 @@ Windows.
   - [Git and go](#git-and-go)
   - [Pandoc](#pandoc)
   - [.NET SDK](#net-sdk)
-  - [Visual Studio Build Tools](#visual-studio-build-tools)
   - [Virtualization Provider](#virtualization-provider)
     - [WSL](#wsl)
     - [Hyper-V](#hyper-v)
@@ -90,30 +89,6 @@ used too and can be installed using `dotnet install`:
 dotnet tool install --global wix
 ```
 
-### Visual Studio Build Tools
-
-The installer includes a C program that checks the installation of the
-pre-required virtualization providers (WSL or Hyper-V). Building this program
-requires the
-[Microsoft C/C++ compiler](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170) and the
-[PowerShell Module VSSetup](https://github.com/microsoft/vssetup.powershell):
-
-1. Download the Build Tools for Visual Studio 2022 installer
-```pwsh
-Invoke-WebRequest -Uri 'https://aka.ms/vs/17/release/vs_BuildTools.exe' -OutFile "$env:TEMP\vs_BuildTools.exe"
-```
-2. Run the installer with the parameter to include the optional C/C++ Tools
-```pwsh
-& "$env:TEMP\vs_BuildTools.exe" --passive --wait `
-                      --add Microsoft.VisualStudio.Workload.VCTools `
-                      --includeRecommended `
-                      --remove Microsoft.VisualStudio.Component.VC.CMake.Project
-```
-3. Install the PowerShell Module VSSetup
-```pwsh
-Install-Module VSSetup
-```
-
 ### Virtualization Provider
 
 Running Podman on Windows requires a virtualization provider. The supported
@@ -314,8 +289,7 @@ To learn how to use the Podman client, refer to its
 ## Build and test the Podman Windows installer
 
 The Podman Windows installer (e.g., `podman-5.1.0-dev-setup.exe`) is a bundle
-that includes an msi package (`podman.msi`) and installs the WSL kernel
-(`podman-wslkerninst.exe`). It's built using the
+that includes an msi package (`podman.msi`). It's built using the
 [WiX Toolset](https://wixtoolset.org/) and the
 [PanelSwWixExtension](https://github.com/nirbar/PanelSwWixExtension/tree/master5)
 WiX extension. The source code is in the folder `contrib\win-installer`.
@@ -336,9 +310,6 @@ root) with a name like `podman-5.2.0-dev-setup.exe`.
 
 The `installer` target of `winmake.ps1` runs the script
 `contrib\win-installer\build.ps1` that, in turns, executes:
-
-- `build-hooks.bat`: builds `podman-wslkerninst.exe` (WSL kernel installer) and
-  `podman-msihooks.dll` (helper that checks if WSL and Hyper-V are installed).
 - `dotnet build podman.wixproj`: builds `podman.msi` from the WiX source files `podman.wxs`,
   `pages.wxs`, `podman-ui.wxs` and `welcome-install-dlg.wxs`.
 - `dotnet build podman-setup.wixproj`: builds `podman-setup.exe` file from
@@ -521,7 +492,13 @@ tools:
   [`.pre-commit-config.yaml`](.pre-commit-config.yaml)
 
 :information_source: Install [golangci-lint](https://golangci-lint.run) and
-[pre-commit](https://pre-commit.com) to run `winmake.ps1 lint`.
+[pre-commit](https://pre-commit.com) to run `winmake.ps1 lint`:
+    ```pwsh
+    winget install -e golangci-lint.golangci-lint
+    winget install -e Python.Python.3.13
+    pip install pre-commit
+    ```
+
 
 ### winmake validatepr
 

contrib/win-installer/build-hooks.ps1

@@ -103,11 +103,8 @@ if ($ENV:INSTVER -eq "") {
     Exit 1
 }
 
-.\build-hooks.ps1; ExitOnError
 SignItem @("artifacts/win-sshproxy.exe",
-          "artifacts/podman.exe",
-          "artifacts/podman-msihooks.dll",
-          "artifacts/podman-wslkerninst.exe")
+          "artifacts/podman.exe")
 $gvExists = Test-Path "artifacts/gvproxy.exe"
 if ($gvExists) {
     SignItem @("artifacts/gvproxy.exe")

contrib/win-installer/build.ps1

@@ -52,8 +52,6 @@
 		<SetProperty Id="HIDE_PROVIDER_CHOICE" After="AppSearch" Value="1" Sequence="first" Condition="(SKIP_CONFIG_FILE_CREATION = 1) OR (MACHINE_PROVIDER_CONFIG_FILE_PATH) OR (MAIN_EXECUTABLE_FILE_PATH)" />
 
 		<CustomAction Id="OpenGuide" DllEntry="WixShellExec" Impersonate="yes" BinaryRef="Wix4UtilCA_X86" />
-		<CustomAction Id="CheckWSL" Execute="firstSequence" DllEntry="CheckWSL" BinaryRef="PodmanHooks" />
-		<CustomAction Id="CheckHyperV" Execute="firstSequence" DllEntry="CheckHyperV" BinaryRef="PodmanHooks" />
 		<util:BroadcastEnvironmentChange />
 		<Feature Id="Complete" Level="1">
 			<ComponentRef Id="INSTALLDIR_Component" />
@@ -82,12 +80,6 @@
 			<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="OpenGuide" Condition="(WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1) AND (NOT Installed) AND (NOT UpdateStarted)" />
 		</UI>
 
-		<InstallExecuteSequence>
-			<Custom Action="CheckWSL" Before="InstallFiles" />
-			<Custom Action="CheckHyperV" Before="InstallFiles" />
-		</InstallExecuteSequence>
-		<Binary Id="PodmanHooks" SourceFile="artifacts/podman-msihooks.dll" />
-
 		<StandardDirectory Id="ProgramFiles6432Folder">
 			<Directory Id="RedHatPFiles" Name="RedHat">
 				<Directory Id="INSTALLDIR" Name="Podman">

contrib/win-installer/podman-msihooks/check.c

@@ -147,10 +147,20 @@ function Test-Installer{
         Exit 1
     }
 
+    $nextSetupExePath = "$PSScriptRoot\contrib\win-installer\podman-9.9.9-dev-setup.exe"
+    if (!(Test-Path -Path $nextSetupExePath -PathType Leaf)) {
+        Write-Host "The automated tests include testing the upgrade from current version to a future version."
+        Write-Host "That requires a version 9.9.9 of the installer:"
+        Write-Host "   .\winmake.ps1 installer 9.9.9"
+        Write-Host "Build it and retry running installertest."
+        Exit 1
+    }
+
     $command = "$PSScriptRoot\contrib\win-installer\test-installer.ps1"
     $command += " -scenario all"
     $command += " -provider $provider"
     $command += " -setupExePath $setupExePath"
+    $command += " -nextSetupExePath $nextSetupExePath"
     Run-Command "${command}"
 }