Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GPO] Add GPO to disable per-user install #25141

Merged
merged 29 commits into from
Mar 31, 2023
Merged

[GPO] Add GPO to disable per-user install #25141

merged 29 commits into from
Mar 31, 2023

Conversation

stefansjfw
Copy link
Collaborator

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

stefansjfw and others added 23 commits February 13, 2023 15:29
Move per machine check to bootstrapper
Move all defines to common.wxs
Fix CI
Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
It messes up app ID for per-user installation which ends up breaking winget update
of the per-user PT
doc/gpo/README.md Outdated Show resolved Hide resolved
doc/gpo/README.md Outdated Show resolved Hide resolved
doc/gpo/README.md Outdated Show resolved Hide resolved
src/gpo/assets/PowerToys.admx Outdated Show resolved Hide resolved
@microsoft microsoft deleted a comment from github-actions bot Mar 31, 2023
Copy link
Collaborator

@htcfreek htcfreek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does it look in the installer if the GPO is set to true? Do we show a useful message?

doc/gpo/README.md Show resolved Hide resolved

inline gpo_rule_configured_t getDisablePerUserInstallationValue()
{
return getConfiguredValue(POLICY_DISABLE_PER_USER_INSTALLATION);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a mew method that only reads HKLM? In case someone sets the value manually in registry.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, in that case, user would disable it for himself, right? So,no?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was a bit unclear. What I mean is we have a Machine (HKLM) only policy and checking both. This means that you still manually can set it in HKCU. Not sure if this something we should prevent. 🤔

Copy link
Collaborator Author

@stefansjfw stefansjfw Mar 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that you still manually can set it in HKCU

Yes, but who can? Current user? If the current user wants to disable per-user install for himself, so be it :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. Then let's not overcomplicating thing and read both. I only want to mention it.

@stefansjfw
Copy link
Collaborator Author

How does it look in the installer if the GPO is set to true? Do we show a useful message?

Yes, it says the same as others.. That administrator has disabled it.

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>
@stefansjfw stefansjfw changed the title [GPO] Add GPO to disable per-user and per-machine install [GPO] Add GPO to disable per-user install Mar 31, 2023
@stefansjfw
Copy link
Collaborator Author

@htcfreek

image

Copy link
Collaborator

@yuyoyuppe yuyoyuppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Collaborator

@htcfreek htcfreek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stefansjfw stefansjfw merged commit 195f288 into main Mar 31, 2023
@crutkas crutkas deleted the stefan/per_user_gpo branch May 1, 2023 23:51
BLM16 pushed a commit to BLM16/PowerToys that referenced this pull request Jun 22, 2023
* 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 <4016293+snickler@users.noreply.github.com>

* Update installer/PowerToysSetup/generateAllFileComponents.ps1

Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>

* Update installer/PowerToysSetup/generateFileList.ps1

Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>

* 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

* Add per-machine/per-user installation GPOs

* Update doc/gpo/README.md

* Update doc/gpo/README.md

* spellcheck

* Remove disable per-machine policy

* Update doc/gpo/README.md

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>

---------

Co-authored-by: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants