Skip to content

Commit f193ba3

Browse files
zhaopy536zhaopy536
committed
fix pipeline errors
1 parent b47a073 commit f193ba3

8 files changed

+56
-25
lines changed

‎.pipelines/ESRPSigning_installer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"MatchedPath": [
77
"PowerToysSetupCustomActions.dll",
88
"PowerToys*Setup-*.exe",
9-
"PowerToys*Setup-*.msi"
9+
"PowerToys*Setup-*.msi",
10+
"PowerToys*Setup-*.msi",
11+
"PowerToys*SetupVNext-*.exe",
12+
"PowerToys*SetupVNext-*.msi"
1013
],
1114
"SigningInfo": {
1215
"Operations": [

‎.pipelines/v2/templates/job-build-project.yml

+29-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ jobs:
174174
& '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
175175
& '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
176176
& '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
177-
& '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetupVNext.sln'
178177
displayName: Verify ARM64 configurations
179178
180179
- ${{ if eq(parameters.enablePackageCaching, true) }}:
@@ -437,6 +436,13 @@ jobs:
437436
flattenFolders: True
438437
targetFolder: $(JobOutputDirectory)
439438

439+
- task: CopyFiles@2
440+
displayName: Stage Installers
441+
inputs:
442+
contents: "**/PowerToys*SetupVNext-*.exe"
443+
flattenFolders: True
444+
targetFolder: $(JobOutputDirectory)
445+
440446
- task: CopyFiles@2
441447
displayName: Stage Symbols
442448
inputs:
@@ -470,6 +476,28 @@ jobs:
470476
$machineHash | out-file -filepath $combinedMachinePath
471477
displayName: Calculate file hashes
472478
479+
# Output config for installer vnext
480+
- pwsh: |-
481+
$p = "$(JobOutputDirectory)\"
482+
$userHash = ((Get-Item $p\PowerToysUserSetupVNext*.exe | Get-FileHash).Hash);
483+
$machineHash = ((Get-Item $p\PowerToysSetupVNext*.exe | Get-FileHash).Hash);
484+
$userPlat = "hash_user_$(BuildPlatform).txt";
485+
$machinePlat = "hash_machine_$(BuildPlatform).txt";
486+
$combinedUserPath = $p + $userPlat;
487+
$combinedMachinePath = $p + $machinePlat;
488+
489+
echo $p
490+
echo $userPlat
491+
echo $userHash
492+
echo $combinedUserPath
493+
echo $machinePlat
494+
echo $machineHash
495+
echo $combinedMachinePath
496+
497+
$userHash | out-file -filepath $combinedUserPath
498+
$machineHash | out-file -filepath $combinedMachinePath
499+
displayName: Calculate file hashes
500+
473501
# Publishing the GPO files
474502
- pwsh: |-
475503
New-Item "$(JobOutputDirectory)/gpo" -Type Directory

‎.pipelines/v2/templates/steps-build-installer-vnext.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ steps:
2222
2323
- pwsh: |-
2424
$IsPerUser = $${{ parameters.buildUserInstaller }}
25-
$InstallerBuildSlug = "MachineSetupVNext"
25+
$InstallerBuildSlug = "MachineSetup"
2626
$InstallerBasename = "PowerToysSetupVNext"
2727
If($IsPerUser) {
28-
$InstallerBuildSlug = "UserSetupVNext"
28+
$InstallerBuildSlug = "UserSetup"
2929
$InstallerBasename = "PowerToysUserSetupVNext"
3030
}
3131
$InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
@@ -38,7 +38,7 @@ steps:
3838
- task: VSBuild@1
3939
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActions
4040
inputs:
41-
solution: "**/installer/PowerToysSetupVNext.sln"
41+
solution: "**/installer/PowerToysSetup.sln"
4242
vsVersion: 17.0
4343
msbuildArgs: >-
4444
/t:PowerToysSetupCustomActions
@@ -66,13 +66,13 @@ steps:
6666
## INSTALLER START
6767
#### MSI BUILDING AND SIGNING
6868
- task: VSBuild@1
69-
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build MSI
69+
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
7070
inputs:
71-
solution: "**/installer/PowerToysSetupVNext.sln"
71+
solution: "**/installer/PowerToysSetup.sln"
7272
vsVersion: 17.0
7373
msbuildArgs: >-
7474
-restore
75-
/t:PowerToysInstaller
75+
/t:PowerToysInstallerVNext
7676
/p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
7777
/bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
7878
${{ parameters.additionalBuildOptions }}
@@ -101,7 +101,7 @@ steps:
101101
102102
- template: steps-esrp-signing.yml
103103
parameters:
104-
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign MSI
104+
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
105105
signingIdentity: ${{ parameters.signingIdentity }}
106106
inputs:
107107
FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
@@ -113,12 +113,12 @@ steps:
113113
#### BOOTSTRAP BUILDING AND SIGNING
114114

115115
- task: VSBuild@1
116-
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build Bootstrapper
116+
displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
117117
inputs:
118-
solution: "**/installer/PowerToysSetupVNext.sln"
118+
solution: "**/installer/PowerToysSetup.sln"
119119
vsVersion: 17.0
120120
msbuildArgs: >-
121-
/t:PowerToysBootstrapper
121+
/t:PowerToysBootstrapperVNext
122122
/p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
123123
/bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
124124
-restore -graph

‎installer/PowerToysSetup.sln

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ Global
8686
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.Build.0 = Debug|ARM64
8787
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.ActiveCfg = Debug|x64
8888
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.Build.0 = Debug|x64
89-
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.ActiveCfg = Release|x64
90-
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.Build.0 = Release|x64
89+
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.ActiveCfg = Release|ARM64
90+
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.Build.0 = Release|ARM64
9191
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.ActiveCfg = Release|x64
9292
{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.Build.0 = Release|x64
9393
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.ActiveCfg = Debug|ARM64
9494
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.Build.0 = Debug|ARM64
9595
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.ActiveCfg = Debug|x64
9696
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.Build.0 = Debug|x64
97-
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.ActiveCfg = Release|x64
98-
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.Build.0 = Release|x64
97+
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.ActiveCfg = Release|ARM64
98+
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.Build.0 = Release|ARM64
9999
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.ActiveCfg = Release|x64
100100
{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.Build.0 = Release|x64
101101
EndGlobalSection

‎installer/PowerToysSetupVNext/Common.wxi

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<?if $(var.PerUser) = "true"?>
3838
<?define PerMachineYesNo="no"?>
3939
<?define MSIPath="UserSetup"?>
40-
<?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
40+
<?define MSIName="PowerToysUserSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
4141
<?define DefaultInstallDir="LocalAppDataFolder" ?>
4242
<?define RegistryScope="HKCU" ?>
4343
<?define InstallScope="perUser" ?>
@@ -46,7 +46,7 @@
4646
<?else?>
4747
<?define PerMachineYesNo="yes"?>
4848
<?define MSIPath="MachineSetup"?>
49-
<?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
49+
<?define MSIName="PowerToysSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
5050
<?define DefaultInstallDir="ProgramFiles64Folder" ?>
5151
<?define RegistryScope="HKLM" ?>
5252
<?define InstallScope="perMachine" ?>

‎installer/PowerToysSetupVNext/PowerToys.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
1717
<bal:WixStandardBootstrapperApplication
1818
LicenseFile="$(var.RepoDir)\installer\License.rtf"
19-
LogoFile="$(var.RepoDir)\installer\PowerToysSetup\Images\logo44.png"
19+
LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png"
2020
SuppressOptionsUI="no"
2121
SuppressRepair="yes" />
2222
</BootstrapperApplicationRef>

‎installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
2424
<ProductVersion>3.10</ProductVersion>
2525
<SchemaVersion>2.0</SchemaVersion>
26-
<OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
26+
<OutputName>PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
2727
<OutputType>Bundle</OutputType>
2828
<SuppressAclReset>True</SuppressAclReset>
29-
<OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
30-
<OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
29+
<OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
30+
<OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
3131
<OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
3232
<OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
3333
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>

‎installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
2929
<PropertyGroup>
3030
<RunPostBuildEvent>Always</RunPostBuildEvent>
3131
<PostBuildEvent>
32-
call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
32+
call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
3333
call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
3434
call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
3535
call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
@@ -95,8 +95,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
9595
<ProductVersion>3.10</ProductVersion>
9696
<ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
9797
<SchemaVersion>2.0</SchemaVersion>
98-
<OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
99-
<OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
98+
<OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
99+
<OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
100100
<OutputType>Package</OutputType>
101101
<SuppressAclReset>True</SuppressAclReset>
102102
<NuGetPackageImportStamp>

0 commit comments

Comments
 (0)