Arm64 finalize bootstrapper #18500

yuyoyuppe · 2022-05-26T15:47:16Z

Summary of the Pull Request

What is this about:

install vcredist via bootstrapper
migrate to wix 3.14 (system-wide installer instead of nuget package)
update ci scripts to use wix 3.14 installer
fix arm updater

What is included in the PR:

How does someone test / validate:

Quality Checklist

Contributor License Agreement (CLA)

A CLA must be signed. If not, go over here and sign the CLA.

github-actions · 2022-05-26T15:48:23Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (2)

Redistributable
XBinaries

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL codecvt concrt dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid msvcp NETFX netstandard Nvidia otating Postion preperty ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain vccorlib vcomp vcredist vcruntime VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:yuyoyuppe/PowerToys.git repository
on the arm64_finalize_bootstrapper branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1138721434" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

davidegiacometti · 2022-05-26T15:59:10Z

#3073 👀

crutkas · 2022-05-26T16:11:11Z

/azp run

azure-pipelines · 2022-05-26T16:11:20Z

Azure Pipelines failed to run 1 pipeline(s).

github-actions · 2022-05-27T12:22:03Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (2)

EDEF
FCBE

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL codecvt concrt dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid msvcp NETFX netstandard Nvidia otating Postion preperty ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain vccorlib vcomp vcredist vcruntime VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:yuyoyuppe/PowerToys.git repository
on the arm64_finalize_bootstrapper branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1139567751" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

github-actions · 2022-05-27T12:32:00Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (2)

EDEF
FCBE

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL codecvt concrt dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid msvcp NETFX netstandard Nvidia otating Postion preperty ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain vccorlib vcomp vcredist vcruntime VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:yuyoyuppe/PowerToys.git repository
on the arm64_finalize_bootstrapper branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1139575205" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

jaimecbernardo · 2022-05-27T12:48:31Z

installer/PowerToysSetup/PowerToys.wxs

@@ -113,6 +123,22 @@
                    Size="$(var.WinAppSDKPayloadSize)"
                    Version="1.0.3.0"
                    Hash="$(var.WinAppSDKPayloadHash)" />
+            </ExePackage>            
+            <ExePackage
+                Name="VCRedist.exe"


Can we use other name here, like VCRedist-14.32.31326.exe? The main reason for this is that if there's a VCRedist.exe in the same path as the installer, this will try to use that one and fail.
Also is there some code we can use to detect if we get the "more recent version is installed" error and still continue?

Done. Yes, we already do that for a minor version, see DetectCondition="DetectedVCRedistVersion >= 32". And we shouldn't be checking for a greater major version, since it'll probably be ABI-incompatible.

yuyoyuppe · 2022-05-27T16:13:29Z

/azp run

azure-pipelines · 2022-05-27T16:13:35Z

Commenter does not have sufficient privileges for PR 18500 in repo microsoft/PowerToys

jaimecbernardo

LGTM!
It works very well. Great work!

yuyoyuppe added 2 commits May 26, 2022 18:44

[ARM64] Install VCRedist using bootstrapper and fix autoupdate

4781084

[ARM64] Use system-wide WiX toolset instead of a nuget package

332bbb6

yuyoyuppe force-pushed the arm64_finalize_bootstrapper branch from 6e1f415 to 8649911 Compare May 26, 2022 15:51

yuyoyuppe force-pushed the arm64_finalize_bootstrapper branch from 8649911 to dcfbd70 Compare May 26, 2022 16:08

[CI] Install WiX 3.14

5a17e32

yuyoyuppe force-pushed the arm64_finalize_bootstrapper branch from dcfbd70 to 5a17e32 Compare May 26, 2022 16:14

yuyoyuppe and others added 5 commits May 26, 2022 20:08

[CI] add wix install script for release.yml

c7fc222

[Doc] Update WiX install steps

381e05f

[CI]Fix Wix path

2a62424

Double quotes for full wix path

6578109

fixup: verify wix hashes

d2b9921

ignore sha256s

fe7738f

spellcheck

bcd1dc3

yuyoyuppe requested a review from jaimecbernardo May 27, 2022 12:38

jaimecbernardo reviewed May 27, 2022

View reviewed changes

yuyoyuppe added 2 commits May 27, 2022 15:50

updated vcredist name

0e2be34

norestart for vcredist

2dc4206

jaimecbernardo approved these changes May 30, 2022

View reviewed changes

jaimecbernardo merged commit ba4b9cf into microsoft:main May 30, 2022

yuyoyuppe deleted the arm64_finalize_bootstrapper branch May 30, 2022 10:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Arm64 finalize bootstrapper #18500

Arm64 finalize bootstrapper #18500

yuyoyuppe commented May 26, 2022 •

edited

Loading

github-actions bot commented May 26, 2022 •

edited

Loading

davidegiacometti commented May 26, 2022

crutkas commented May 26, 2022

azure-pipelines bot commented May 26, 2022

github-actions bot commented May 27, 2022 •

edited

Loading

github-actions bot commented May 27, 2022 •

edited

Loading

jaimecbernardo May 27, 2022

yuyoyuppe May 27, 2022 •

edited

Loading

yuyoyuppe commented May 27, 2022

azure-pipelines bot commented May 27, 2022

jaimecbernardo left a comment

Arm64 finalize bootstrapper #18500

Arm64 finalize bootstrapper #18500

Conversation

yuyoyuppe commented May 26, 2022 • edited Loading

Summary of the Pull Request

Quality Checklist

Contributor License Agreement (CLA)

github-actions bot commented May 26, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (2)

davidegiacometti commented May 26, 2022

crutkas commented May 26, 2022

azure-pipelines bot commented May 26, 2022

github-actions bot commented May 27, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (2)

github-actions bot commented May 27, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (2)

jaimecbernardo May 27, 2022

Choose a reason for hiding this comment

yuyoyuppe May 27, 2022 • edited Loading

Choose a reason for hiding this comment

yuyoyuppe commented May 27, 2022

azure-pipelines bot commented May 27, 2022

jaimecbernardo left a comment

Choose a reason for hiding this comment

yuyoyuppe commented May 26, 2022 •

edited

Loading

github-actions bot commented May 26, 2022 •

edited

Loading

github-actions bot commented May 27, 2022 •

edited

Loading

github-actions bot commented May 27, 2022 •

edited

Loading

yuyoyuppe May 27, 2022 •

edited

Loading