From 6b7237eaf6b8a5fc14da570c08a638f2657ab770 Mon Sep 17 00:00:00 2001 From: htcfreek <61519853+htcfreek@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:06:08 +0100 Subject: [PATCH 1/3] add new policy --- policies/WindowsTerminal.admx | 105 +++++++++++++++++++++------- policies/en-US/WindowsTerminal.adml | 12 ++++ 2 files changed, 93 insertions(+), 24 deletions(-) diff --git a/policies/WindowsTerminal.admx b/policies/WindowsTerminal.admx index 48c36aec7eb..5bb410d2a39 100644 --- a/policies/WindowsTerminal.admx +++ b/policies/WindowsTerminal.admx @@ -1,28 +1,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {00000000-0000-0000-0000-000000000000} + + + + + {00000000-0000-0000-0000-000000000000} + + + + + + + {B23D10C0-E52E-411E-9D5B-C09FDF709C7D} + + + + + {B23D10C0-E52E-411E-9D5B-C09FDF709C7D} + + + + + + + {E12CFF52-A866-4C77-9A90-F570A7AA2C6B} + + + + + {2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69} + + + + + + + {86633F1F-6454-40EC-89CE-DA4EBA977EE2} + + + + + {06EC847C-C0A5-46B8-92CB-7C92F6E35CD5} + + + + + + + + diff --git a/policies/en-US/WindowsTerminal.adml b/policies/en-US/WindowsTerminal.adml index 5516292e123..95767846dc5 100644 --- a/policies/en-US/WindowsTerminal.adml +++ b/policies/en-US/WindowsTerminal.adml @@ -7,6 +7,7 @@ Windows Terminal At least Windows Terminal 1.21 + At least Windows 11 22H2 or Windows 10 22H2 (Build 19045.3031, KB5026435) with Windows Terminal 1.17 Disabled Profile Sources Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file. @@ -18,11 +19,22 @@ Common sources are: For instance, setting this policy to Windows.Terminal.Wsl will disable the builtin WSL integration of Windows Terminal. Note: Existing profiles will disappear from Windows Terminal after adding their source to this policy. + Default terminal application + Select the default terminal application used in Windows. + +If you select Windows Terminal Preview and it is not installed the system will fallback to Windows Console Host (legacy). (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.) + Automatic selection (Windows Terminal, if available) + Windows Console Host (legacy) + Windows Terminal + Windows Terminal Preview (if available) List of disabled sources (one per line) + + Select from the following options: + From c9789b7685b7731ccd63aef2d1a6253e549dbeab Mon Sep 17 00:00:00 2001 From: htcfreek <61519853+htcfreek@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:10:53 +0100 Subject: [PATCH 2/3] update description --- policies/en-US/WindowsTerminal.adml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policies/en-US/WindowsTerminal.adml b/policies/en-US/WindowsTerminal.adml index 95767846dc5..03490dc49bf 100644 --- a/policies/en-US/WindowsTerminal.adml +++ b/policies/en-US/WindowsTerminal.adml @@ -22,7 +22,7 @@ Note: Existing profiles will disappear from Windows Terminal after adding their Default terminal application Select the default terminal application used in Windows. -If you select Windows Terminal Preview and it is not installed the system will fallback to Windows Console Host (legacy). (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.) +If you select Windows Terminal Preview and it is not installed the system will fallback to the legacy Windows Console Host. (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.) Automatic selection (Windows Terminal, if available) Windows Console Host (legacy) Windows Terminal From b1fce51ff370c324788af4cc909008d9539e7a9e Mon Sep 17 00:00:00 2001 From: htcfreek <61519853+htcfreek@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:41:16 +0100 Subject: [PATCH 3/3] tests --- policies/WindowsTerminal.admx | 6 ++- policies/en-US/WindowsTerminal.adml | 75 +++++++++++++++++++---------- 2 files changed, 54 insertions(+), 27 deletions(-) diff --git a/policies/WindowsTerminal.admx b/policies/WindowsTerminal.admx index 5bb410d2a39..e129acf8537 100644 --- a/policies/WindowsTerminal.admx +++ b/policies/WindowsTerminal.admx @@ -29,7 +29,9 @@ - + + + diff --git a/policies/en-US/WindowsTerminal.adml b/policies/en-US/WindowsTerminal.adml index 03490dc49bf..4c69d17331d 100644 --- a/policies/en-US/WindowsTerminal.adml +++ b/policies/en-US/WindowsTerminal.adml @@ -1,15 +1,15 @@ - Windows Terminal - Windows Terminal - - - Windows Terminal - At least Windows Terminal 1.21 - At least Windows 11 22H2 or Windows 10 22H2 (Build 19045.3031, KB5026435) with Windows Terminal 1.17 - Disabled Profile Sources - Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file. + Windows Terminal + Windows Terminal + + + Windows Terminal + At least Windows Terminal 1.21 + At least Windows 11 22H2 or Windows 10 22H2 (Build 19045.3031, KB5026435) with Windows Terminal 1.17 + Disabled Profile Sources + Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file. Common sources are: - Windows.Terminal.Azure @@ -19,22 +19,47 @@ Common sources are: For instance, setting this policy to Windows.Terminal.Wsl will disable the builtin WSL integration of Windows Terminal. Note: Existing profiles will disappear from Windows Terminal after adding their source to this policy. - Default terminal application - Select the default terminal application used in Windows. + Default terminal application + + Configure the default terminal application used in Windows. + +Well known configurations +- Automatic selection (Windows Terminal, if available): + DelegationTerminal = {00000000-0000-0000-0000-000000000000} + DelegationConsole = {00000000-0000-0000-0000-000000000000} +- Windows Console Host (legacy): + DelegationTerminal = {B23D10C0-E52E-411E-9D5B-C09FDF709C7D} + DelegationConsole = {B23D10C0-E52E-411E-9D5B-C09FDF709C7D} +- Windows Terminal: + DelegationTerminal = {E12CFF52-A866-4C77-9A90-F570A7AA2C6B} + DelegationConsole = {2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69} +- Windows Terminal Preview (if available): + DelegationTerminal = {86633F1F-6454-40EC-89CE-DA4EBA977EE2} + DelegationConsole = {06EC847C-C0A5-46B8-92CB-7C92F6E35CD5} + +If you set Windows Terminal Preview and it is not installed the system will fallback to the legacy Windows Console Host. (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.) + + + + List of disabled sources (one per line) + + + + + + {00000000-0000-0000-0000-000000000000} + + + + {00000000-0000-0000-0000-000000000000} + + + +