[installer] Support per-user installation #24087

stefansjfw · 2023-02-13T15:19:04Z

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

build both installers
try installing both versions of PT
- ensure that per-machine version is installed in Program files by default and registry entries are in HKLM
- ensure that per-user version is installed in user's app data folder by default and registry entries are in HKCU
- try installing per-user version over per-machine version
  - ensure that error message that per-machine version is already installed is shown
- try installing per-machine version over per-user version
  - ensure it works

installer/PowerToysSetup/WinAppSDK.wxs

htcfreek

I know this is WIP. But I want to write my thoughts in an early state because they could be code changing.

htcfreek · 2023-02-13T17:37:45Z

installer/PowerToysSetup/Common.wxi

  <?endif?>
+
+  <?if $(var.PerUser) = "true"?>


What is setting this? Installer parameter? For enterprise usage I think two things are required: Allow forcing machine install and blocking user install using a GPO. (Cc: @jaimecbernardo for the GPO.)

Allow forcing machine install

This is a build argument. There will be 2 separate installers. Like for VSCode.

blocking user install using a GPO

Good point.

@stefansjfw
The PR #24221 implements a new GPO category where you can add your installer GPO. ;-)

blocking user install using a GPO

Good point.

What about the GPO. Will this be a second PR?

It's on TODO list, It'll probably go as a follow-up PR

htcfreek · 2023-02-13T17:43:48Z

src/common/utils/registry.h

+                        // HKCU key is missing
+                        RegCloseKey(perUserKey);
+                        return InstallScope::PerMachine;


What makes more sense?
'No HKCU'=Machine or 'HKLM exist'=Machine. What happens if both are installed because a user tries to go around company restrictions for update cycles?

'HKLM exist'=Machine

This is not possible as we need to be backward compatible with the versions that doesn't have this reg entry.

What makes more sense?
'No HKCU'=Machine or 'HKLM exist'=Machine. What happens if both are installed because a user tries to go around company restrictions for update cycles?

This is yet to be decided, i.e. what to do in this scenario

What makes more sense?
'No HKCU'=Machine or 'HKLM exist'=Machine. What happens if both are installed because a user tries to go around company restrictions for update cycles?

This is yet to be decided, i.e. what to do in this scenario

Fyi:

Admins expect that machine GPOs have priority over user GPOs. It the normal behavior in Windows, Office, Edge, ...

If a user has no admin permission he can't manipulate user and machine policies. Neither using gpedit.msc, nor changing the Registry values.

And maybe we should simply block installing both at the same time. This makes no sense and I am sure it will make trouble. 😅

stefansjfw · 2023-02-13T17:47:33Z

I know this is WIP. But I want to write my thoughts in an early state because they could be code changing.

Sure. I'm looking forward to this

Move per machine check to bootstrapper Move all defines to common.wxs Fix CI

stefansjfw · 2023-02-22T10:14:23Z

@snickler Maybe you wanna take a look at/review the scripts here :)

jaimecbernardo

Need to revert the endpoints to production endpoints before merging.

src/common/updating/updating.cpp

snickler · 2023-02-22T11:18:12Z

@snickler Maybe you wanna take a look at/review the scripts here :)

Will do 😎

installer/PowerToysSetup/generateAllFileComponents.ps1

installer/PowerToysSetup/generateFileList.ps1

Co-authored-by: Jeremy Sinclair <[email protected]>

This reverts commit 34545da.

It messes up app ID for per-user installation which ends up breaking winget update of the per-user PT

crutkas · 2023-03-20T17:12:40Z

@stefansjfw with Jaime OOF, should i remove his blocking review?

stefansjfw · 2023-03-20T17:24:04Z

@stefansjfw with Jaime OOF, should i remove his blocking review?

Yes, please.

yuyoyuppe · 2023-03-22T16:59:21Z

installer/PowerToysSetup/generateAllFileComponents.ps1

+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoCustomLanguagesFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
+
+#FileLocksmith
+#TODO: There are multiple .deps.json files, make sure it works as expected


Perhaps we could introduce a for loop here for the Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1?

src/common/utils/registry.h

Addressed

yuyoyuppe

awesome stuff! :)

htcfreek

Please add a "block per user install" before releasing this change. Otherwise IT departments may get problems with already deployed (SCCM, ...) per machine install, I think.

The gpo should block exe and extracted msi from installing as per user. Having it only as machine policy is enough here.

stefansjfw · 2023-03-31T09:58:34Z

Please add a "block per user install" before releasing this change.

No worries, it's in progress. Expect PR soon

snickler · 2023-03-31T16:15:58Z

Woo hoo!

* Add per user installer * Separate upgrade codes for per machine and per user installation Move per machine check to bootstrapper Move all defines to common.wxs Fix CI * Update installer/PowerToysSetup/generateFileList.ps1 Co-authored-by: Jeremy Sinclair <[email protected]> * Update installer/PowerToysSetup/generateAllFileComponents.ps1 Co-authored-by: Jeremy Sinclair <[email protected]> * Update installer/PowerToysSetup/generateFileList.ps1 Co-authored-by: Jeremy Sinclair <[email protected]> * expect.txt * Revert "Update installer/PowerToysSetup/generateFileList.ps1" This reverts commit 34545da. * Update release CI to build both installers * Revert bundle name change It messes up app ID for per-user installation which ends up breaking winget update of the per-user PT * spellcheck * Fix bad merge * Add RegistryPreview * Include backup_restore_settings.json * Revert testing endpoint change --------- Co-authored-by: Jeremy Sinclair <[email protected]>

Add per user installer

65a7b88

stefansjfw marked this pull request as draft February 13, 2023 15:19

stefansjfw changed the title ~~[installer] Support per-user installation~~ [draft][installer] Support per-user installation Feb 13, 2023

stefansjfw marked this pull request as ready for review February 13, 2023 15:35

microsoft deleted a comment from azure-pipelines bot Feb 13, 2023

stefansjfw marked this pull request as draft February 13, 2023 15:37

Jay-o-Way reviewed Feb 13, 2023

View reviewed changes

installer/PowerToysSetup/WinAppSDK.wxs Show resolved Hide resolved

stefansjfw force-pushed the stefan/per_user_instal branch from 0fa29a2 to 7c771e0 Compare February 13, 2023 15:53

microsoft deleted a comment from azure-pipelines bot Feb 13, 2023

stefansjfw force-pushed the stefan/per_user_instal branch 2 times, most recently from d3c6d97 to f7dbda9 Compare February 13, 2023 17:19

htcfreek reviewed Feb 13, 2023

View reviewed changes

Separate upgrade codes for per machine and per user installation

14f36cb

Move per machine check to bootstrapper Move all defines to common.wxs Fix CI

stefansjfw force-pushed the stefan/per_user_instal branch from f7dbda9 to 14f36cb Compare February 14, 2023 11:40

stefansjfw changed the title ~~[draft][installer] Support per-user installation~~ [installer] Support per-user installation Feb 22, 2023

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

a2eac05

stefansjfw marked this pull request as ready for review February 22, 2023 10:07

jaimecbernardo previously requested changes Feb 22, 2023

View reviewed changes

src/common/updating/updating.cpp Outdated Show resolved Hide resolved

snickler reviewed Feb 22, 2023

View reviewed changes

installer/PowerToysSetup/generateAllFileComponents.ps1 Outdated Show resolved Hide resolved

installer/PowerToysSetup/generateFileList.ps1 Outdated Show resolved Hide resolved

installer/PowerToysSetup/generateFileList.ps1 Outdated Show resolved Hide resolved

stefansjfw and others added 2 commits March 7, 2023 22:32

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

03ea420

Update installer/PowerToysSetup/generateFileList.ps1

34545da

Co-authored-by: Jeremy Sinclair <[email protected]>

This comment has been minimized.

Sign in to view

stefansjfw and others added 5 commits March 7, 2023 22:34

Update installer/PowerToysSetup/generateAllFileComponents.ps1

f44ccca

Co-authored-by: Jeremy Sinclair <[email protected]>

Update installer/PowerToysSetup/generateFileList.ps1

4ba537d

Co-authored-by: Jeremy Sinclair <[email protected]>

expect.txt

9bc160f

Revert "Update installer/PowerToysSetup/generateFileList.ps1"

68b2f57

This reverts commit 34545da.

Update release CI to build both installers

30af633

Revert bundle name change

8fc9014

It messes up app ID for per-user installation which ends up breaking winget update of the per-user PT

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

665a306

This comment has been minimized.

Sign in to view

spellcheck

7235d87

yuyoyuppe reviewed Mar 22, 2023

View reviewed changes

stefansjfw added 5 commits March 24, 2023 23:45

Fix bad merge

7d983db

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

bf0e514

Add RegistryPreview

7357213

Include backup_restore_settings.json

29ce624

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

5373de9

yuyoyuppe reviewed Mar 29, 2023

View reviewed changes

src/common/utils/registry.h Show resolved Hide resolved

stefansjfw added 3 commits March 29, 2023 17:41

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

2512cbf

Merge remote-tracking branch 'origin/main' into stefan/per_user_instal

98d3233

Revert testing endpoint change

01f83f4

yuyoyuppe approved these changes Mar 31, 2023

View reviewed changes

htcfreek suggested changes Mar 31, 2023

View reviewed changes

stefansjfw merged commit 870f8e3 into main Mar 31, 2023

crutkas deleted the stefan/per_user_instal branch May 1, 2023 23:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[installer] Support per-user installation #24087

[installer] Support per-user installation #24087

stefansjfw commented Feb 13, 2023 •

edited

Loading

htcfreek left a comment

htcfreek Feb 13, 2023

stefansjfw Feb 13, 2023

htcfreek Feb 20, 2023

htcfreek Mar 20, 2023

stefansjfw Mar 21, 2023

htcfreek Feb 13, 2023

stefansjfw Feb 13, 2023

htcfreek Feb 20, 2023 •

edited

Loading

stefansjfw commented Feb 13, 2023

stefansjfw commented Feb 22, 2023

jaimecbernardo left a comment

snickler commented Feb 22, 2023

This comment has been minimized.

crutkas commented Mar 20, 2023

stefansjfw commented Mar 20, 2023

This comment has been minimized.

yuyoyuppe Mar 22, 2023

yuyoyuppe left a comment

htcfreek left a comment

stefansjfw commented Mar 31, 2023

snickler commented Mar 31, 2023

[installer] Support per-user installation #24087

[installer] Support per-user installation #24087

Conversation

stefansjfw commented Feb 13, 2023 • edited Loading

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

htcfreek left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

htcfreek Feb 20, 2023 • edited Loading

Choose a reason for hiding this comment

stefansjfw commented Feb 13, 2023

stefansjfw commented Feb 22, 2023

jaimecbernardo left a comment

Choose a reason for hiding this comment

snickler commented Feb 22, 2023

This comment has been minimized.

crutkas commented Mar 20, 2023

stefansjfw commented Mar 20, 2023

This comment has been minimized.

Choose a reason for hiding this comment

yuyoyuppe left a comment

Choose a reason for hiding this comment

htcfreek left a comment

Choose a reason for hiding this comment

stefansjfw commented Mar 31, 2023

snickler commented Mar 31, 2023

stefansjfw commented Feb 13, 2023 •

edited

Loading

htcfreek Feb 20, 2023 •

edited

Loading