remove unused

update copy
only use vnext
2026-02-03 09:50:06 +01:00 · 2025-07-21 21:54:16 +08:00 · 2025-07-21 21:50:05 +08:00 · 2025-07-21 21:16:54 +08:00 · 2025-07-21 16:43:04 +08:00 · 2025-07-21 16:36:55 +08:00
2 changed files with 19 additions and 8 deletions
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -514,9 +514,11 @@ jobs:
      targetFolder: $(JobOutputDirectory)

  - task: CopyFiles@2
-    displayName: Stage Installers
+    displayName: Stage VNext Installers
    inputs:
-      contents: "**/PowerToys*SetupVNext-*.exe"
+      contents: |-
+        installer/PowerToysSetupVNext/**/PowerToys*SetupVNext-*.exe
+        !installer/PowerToysSetupVNext/obj/**
      flattenFolders: True
      targetFolder: $(JobOutputDirectory)

--- a/.pipelines/v2/templates/steps-build-installer-vnext.yml
+++ b/.pipelines/v2/templates/steps-build-installer-vnext.yml
@@ -16,6 +16,14 @@ parameters:
    default: ''

 steps:
+  # Install WiX 5.0.2 tools needed for VNext installer (matching project SDK)
+  - task: DotNetCoreCLI@2
+    displayName: Install WiX 5.0.2 tools
+    inputs:
+      command: 'custom'
+      custom: 'tool'
+      arguments: 'install --global wix --version 5.0.2'
+
  - pwsh: |-
      & git clean -xfd -e *exe -- .\installer\
    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
@@ -83,9 +91,9 @@ steps:
      maximumCpuCount: true

  - script: |-
-      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi
+      wix msi decompile installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
      dir $(build.sourcesdirectory)\extractedMsi
-    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"

  # Check if deps.json files don't reference different dll versions.
  - pwsh: |-
@@ -133,8 +141,8 @@ steps:
  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
  - ${{ if eq(parameters.codeSign, true) }}:
    - script: |-
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
+        wix burn detach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"

    - template: steps-esrp-signing.yml
      parameters:
@@ -169,8 +177,8 @@ steps:
            ]

    - script: |-
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
+        wix burn reattach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Reattach Engine to Bundle"

    - template: steps-esrp-signing.yml
      parameters:
@@ -181,5 +189,6 @@ steps:
          signType: batchSigning
          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
  #### END BOOTSTRAP
  ## END INSTALLER
Author	SHA1	Message	Date
Leilei Zhang	fb6006e933	remove unused	2025-07-21 21:54:16 +08:00
Leilei Zhang	f7f628e208	update copy	2025-07-21 21:50:05 +08:00
Leilei Zhang	3e5195f81d	only use vnext	2025-07-21 21:16:54 +08:00
Leilei Zhang	32a47c6654	fix version	2025-07-21 16:43:04 +08:00
Leilei Zhang	b3b38a0ea3	use reattach	2025-07-21 16:36:55 +08:00
Leilei Zhang	b81620abbd	install	2025-07-21 14:17:50 +08:00
Leilei Zhang	c0592ef71e	update sign logic	2025-07-21 11:57:02 +08:00