Skip to content

Commit bebd646

Browse files
RomanithoRomanitho
authored
Merge pull request #990 from Romanitho/cleaning
Cleaning old deprecated policies
2 parents 8a26b3f + a2c0d8f commit bebd646

File tree

2 files changed

+67
-142
lines changed

2 files changed

+67
-142
lines changed

‎Sources/Policies/ADMX/WAU.admx‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -372,31 +372,6 @@
372372
<decimal value="0" />
373373
</disabledValue>
374374
</policy>
375-
<policy name="DesktopShortcut_Enable" class="Machine"
376-
displayName="$(string.DesktopShortcut_Name)" explainText="$(string.DesktopShortcut_Explain)"
377-
key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_DesktopShortcut">
378-
<parentCategory ref="WAU" />
379-
<supportedOn ref="WAU:SUPPORTED_WAU_1_16_0" />
380-
<enabledValue>
381-
<decimal value="1" />
382-
</enabledValue>
383-
<disabledValue>
384-
<decimal value="0" />
385-
</disabledValue>
386-
</policy>
387-
<policy name="StartMenuShortcut_Enable" class="Machine"
388-
displayName="$(string.StartMenuShortcut_Name)"
389-
explainText="$(string.StartMenuShortcut_Explain)"
390-
key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_StartMenuShortcut">
391-
<parentCategory ref="WAU" />
392-
<supportedOn ref="WAU:SUPPORTED_WAU_1_16_0" />
393-
<enabledValue>
394-
<decimal value="1" />
395-
</enabledValue>
396-
<disabledValue>
397-
<decimal value="0" />
398-
</disabledValue>
399-
</policy>
400375
<policy name="MaxLogFiles_Name" class="Machine" displayName="$(string.MaxLogFiles_Name)"
401376
explainText="$(string.MaxLogFiles_Explain)"
402377
key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.MaxLogFiles)">

‎Sources/Policies/ADMX/en-US/WAU.adml‎

Lines changed: 67 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -11,119 +11,94 @@
1111
<string id="SUPPORTED_WAU_1_16_0">Winget-AutoUpdate version 1.16.0 or later</string>
1212
<string id="SUPPORTED_WAU_1_16_5">Winget-AutoUpdate version 1.16.5 or later</string>
1313
<string id="SUPPORTED_WAU_2_6_0">Winget-AutoUpdate version 2.6.0 or later</string>
14-
<string id="SUPPORTED_WAU_EXPERIMENTAL">Winget-AutoUpdate Experimental, subject to change, do
15-
not use on PROD</string>
14+
<string id="SUPPORTED_WAU_EXPERIMENTAL">Winget-AutoUpdate Experimental, subject to change, do not use on PROD</string>
1615
<string id="ActivateGPOManagement_Name">Activate WAU GPO Management [DEPRECATED]</string>
17-
<string id="ActivateGPOManagement_Explain">This policy setting is deprecated and will be
18-
removed in a future version. The GPO Management is now always enabled when GPO policies are
19-
configured.
16+
<string id="ActivateGPOManagement_Explain">This policy setting is deprecated and will be removed in a future version. The GPO Management is now always enabled when GPO policies are configured.
2017

21-
This policy previously controlled whether GPO Management of Winget-AutoUpdate was active or
22-
not.</string>
18+
This policy previously controlled whether GPO Management of Winget-AutoUpdate was active or not.</string>
2319
<string id="BypassListForUsers_Name">Bypass Black/White list for User</string>
24-
<string id="BypassListForUsers_Explain">This policy setting specifies whether to
25-
Bypass Black/White list when run in user context or not.
20+
<string id="BypassListForUsers_Explain">This policy setting specifies whether to Bypass Black/White list when run in user context or not.
2621

27-
If this policy is disabled or not configured, the default is No.</string>
22+
If this policy is disabled or not configured, the default is No.</string>
2823
<string id="DisableAutoUpdate_Name">Disable WAU AutoUpdate</string>
29-
<string id="DisableAutoUpdate_Explain">This policy setting specifies whether to
30-
Disable WAU AutoUpdate or not:
31-
By default, WAU AutoUpdate is enabled.
32-
It will not overwrite the configurations, icons (if personalised),
33-
excluded_apps list...
24+
<string id="DisableAutoUpdate_Explain">This policy setting specifies whether to Disable WAU AutoUpdate or not:
25+
By default, WAU AutoUpdate is enabled.
26+
It will not overwrite the configurations, icons (if personalised),
27+
excluded_apps list...
3428

35-
If this policy is disabled or not configured, the default is No.</string>
29+
If this policy is disabled or not configured, the default is No.</string>
3630
<string id="DoNotRunOnMetered_Name">Run WAU on metered connection</string>
37-
<string id="DoNotRunOnMetered_Explain">This policy setting specifies whether to
38-
Run WAU on metered connection or not.
31+
<string id="DoNotRunOnMetered_Explain">This policy setting specifies whether to Run WAU on metered connection or not.
3932

40-
If this policy is disabled or not configured, the default is No.</string>
33+
If this policy is disabled or not configured, the default is No.</string>
4134
<string id="UpdatePrerelease_Name">Update WAU to PreRelease versions</string>
42-
<string id="UpdatePrerelease_Explain">This policy setting specifies whether to
43-
update WAU to PreRelease versions or not (via WAU AutoUpdate).
35+
<string id="UpdatePrerelease_Explain">This policy setting specifies whether to update WAU to PreRelease versions or not (via WAU AutoUpdate).
4436

45-
If this policy is disabled or not configured, the default is No.</string>
37+
If this policy is disabled or not configured, the default is No.</string>
4638
<string id="BlackList_Name">Application GPO Blacklist</string>
47-
<string id="BlackList_Explain">Provide the WinGet IDs of applications you want to
48-
exclude.
39+
<string id="BlackList_Explain">Provide the WinGet IDs of applications you want to exclude.
4940

50-
If this policy is disabled or not configured, GPO Blacklist is not used.</string>
41+
If this policy is disabled or not configured, GPO Blacklist is not used.</string>
5142
<string id="WhiteList_Name">Application GPO Whitelist</string>
52-
<string id="WhiteList_Explain">Provide the WinGet IDs of applications you want to
53-
include.
43+
<string id="WhiteList_Explain">Provide the WinGet IDs of applications you want to include.
5444

55-
If this policy is disabled or not configured, GPO Whitelist is not used.</string>
45+
If this policy is disabled or not configured, GPO Whitelist is not used.</string>
5646
<string id="UseWhiteList_Name">Use WhiteList instead of BlackList</string>
57-
<string id="UseWhiteList_Explain">This policy setting specifies whether to use a
58-
Whitelist or not.
47+
<string id="UseWhiteList_Explain">This policy setting specifies whether to use a Whitelist or not.
5948

60-
If this policy is disabled or not configured, the default is No.</string>
49+
If this policy is disabled or not configured, the default is No.</string>
6150
<string id="ListPath_Name">Get Black/White List from external Path (URL/UNC/GPO/Local)</string>
62-
<string id="ListPath_Explain">If this policy is enabled, you can set a
63-
(URL/UNC/GPO/Local) Path to external lists other than the default.
64-
If "Application GPO Blacklist/Whitelist" is set in this GPO the Path MUST be:
65-
GPO
51+
<string id="ListPath_Explain">If this policy is enabled, you can set a (URL/UNC/GPO/Local) Path to external lists other than the default.
52+
If "Application GPO Blacklist/Whitelist" is set in this GPO the Path MUST be: GPO
6653

67-
If this policy is disabled or not configured, the default ListPath is used
68-
(WAU InstallLocation).</string>
54+
If this policy is disabled or not configured, the default ListPath is used (WAU InstallLocation).</string>
6955
<string id="ModsPath_Name">Get Mods from external Path (URL/UNC/Local/AzureBlob)</string>
70-
<string id="ModsPath_Explain">If this policy is enabled, you can set a
71-
(URL/UNC/Local/AzureBlob) Path to external mods other than the default.
56+
<string id="ModsPath_Explain">If this policy is enabled, you can set a (URL/UNC/Local/AzureBlob) Path to external mods other than the default.
7257

73-
If this policy is disabled or not configured, the default ModsPath is used
74-
(WAU InstallLocation).
58+
If this policy is disabled or not configured, the default ModsPath is used (WAU InstallLocation).
7559

76-
Note: When set to 'AzureBlob', ensure you also configure 'Set Azure Blob URL
77-
with SAS token'.</string>
60+
Note: When set to 'AzureBlob', ensure you also configure 'Set Azure Blob URL with SAS token'.</string>
7861
<string id="BlobURL_Name">Set Azure Blob URL with SAS Token</string>
79-
<string id="BlobURL_Explain">If this policy is enabled, you can set an Azure
80-
Storage Blob URL with SAS token for use with the 'Mods' feature. The URL
81-
must include the SAS token and have 'read' and 'list' permissions.
62+
<string id="BlobURL_Explain">If this policy is enabled, you can set an Azure Storage Blob URL with SAS token for use with the 'Mods' feature. The URL must include the SAS token and have 'read' and 'list' permissions.
8263

83-
If this policy is disabled or not configured, the value is blank and Azure
84-
Blob storage will NOT work.</string>
64+
If this policy is disabled or not configured, the value is blank and Azure Blob storage will NOT work.</string>
8565
<string id="NotificationLevel_Name">Notification Level</string>
86-
<string id="NotificationLevel_Explain">If this policy is enabled, you can
87-
configure the Notification Level:
88-
1. Full (Default)
89-
2. SuccessOnly
90-
3. ErrorsOnly
91-
4. None
66+
<string id="NotificationLevel_Explain">If this policy is enabled, you can configure the Notification Level:
67+
1. Full (Default)
68+
2. SuccessOnly
69+
3. ErrorsOnly
70+
4. None
9271

93-
If this policy is not configured or disabled, Notification Level: (1. Full).</string>
72+
If this policy is not configured or disabled, Notification Level: (1. Full).</string>
9473
<string id="NotificationLevel_Full">1. Full (Default)</string>
9574
<string id="NotificationLevel_SuccessOnly">2. SuccessOnly</string>
9675
<string id="NotificationLevel_ErrorsOnly">3. ErrorsOnly</string>
9776
<string id="NotificationLevel_None">4. None</string>
9877
<string id="UpdatesInterval_Name">Updates Interval</string>
99-
<string id="UpdatesInterval_Explain">If this policy is enabled, you can configure
100-
the Updates Interval:
101-
1. Daily (Default)
102-
2. BiDaily
103-
3. Weekly
104-
4. BiWeekly
105-
5. Monthly
106-
6. Never (e.g. in combination with 'Updates at Logon')
107-
108-
If this policy is not configured or disabled, Updates Interval: (1. Daily).</string>
78+
<string id="UpdatesInterval_Explain">If this policy is enabled, you can configure the Updates Interval:
79+
1. Daily (Default)
80+
2. BiDaily
81+
3. Weekly
82+
4. BiWeekly
83+
5. Monthly
84+
6. Never (e.g. in combination with 'Updates at Logon')
85+
86+
If this policy is not configured or disabled, Updates Interval: (1. Daily).</string>
10987
<string id="UpdatesInterval_Daily">1. Daily (Default)</string>
11088
<string id="UpdatesInterval_BiDaily">2. BiDaily</string>
11189
<string id="UpdatesInterval_Weekly">3. Weekly</string>
11290
<string id="UpdatesInterval_BiWeekly">4. BiWeekly</string>
11391
<string id="UpdatesInterval_Monthly">5. Monthly</string>
114-
<string id="UpdatesInterval_Never">6. Never (e.g. in combination with 'Updates
115-
Interval')</string>
92+
<string id="UpdatesInterval_Never">6. Never (e.g. in combination with 'Updates Interval')</string>
11693
<string id="UpdatesAtLogon_Name">Updates at Logon</string>
117-
<string id="UpdatesAtLogon_Explain">This policy setting specifies whether to set
118-
WAU to run at user logon or not.
94+
<string id="UpdatesAtLogon_Explain">This policy setting specifies whether to set WAU to run at user logon or not.
11995

120-
If this policy is disabled or not configured, the default is No.</string>
96+
If this policy is disabled or not configured, the default is No.</string>
12197
<string id="UpdatesAtTime_Name">Updates at Time</string>
122-
<string id="UpdatesAtTime_Explain">If this policy is enabled, you can configure
123-
the Sheduled Task Update time:
124-
From 01:00 to 24:00 (Military/24 Hour Time)
98+
<string id="UpdatesAtTime_Explain">If this policy is enabled, you can configure the Sheduled Task Update time:
99+
From 01:00 to 24:00 (Military/24 Hour Time)
125100

126-
If this policy is not configured or disabled, Updates at Time: (06:00 AM).</string>
101+
If this policy is not configured or disabled, Updates at Time: (06:00 AM).</string>
127102
<string id="UpdatesAtTime01">01:00 AM</string>
128103
<string id="UpdatesAtTime02">02:00</string>
129104
<string id="UpdatesAtTime03">03:00</string>
@@ -149,60 +124,35 @@
149124
<string id="UpdatesAtTime23">23:00</string>
150125
<string id="UpdatesAtTime24">24:00</string>
151126
<string id="UserContext_Name">User context execution</string>
152-
<string id="UserContext_Explain">This policy setting specifies whether to enable
153-
User context execution or not.
154-
155-
If this policy is disabled or not configured, the default is No.</string>
156-
<string id="DesktopShortcut_Name">Enable Deskop Shortcut [DEPRECATED]</string>
157-
<string id="DesktopShortcut_Explain">This policy setting specifies whether to
158-
enable a Desktop Shortcut or not:
159-
WAU - Check for updated Apps
160-
161-
If this policy is disabled or not configured, the default is No.</string>
162-
<string id="StartMenuShortcut_Name">Enable Start Menu Shortcuts [DEPRECATED]</string>
163-
<string id="StartMenuShortcut_Explain">This policy setting specifies whether to
164-
enable the Start Menu Shortcuts or not:
165-
WAU - Check for updated Apps
166-
WAU - Open logs
167-
WAU - Web Help
127+
<string id="UserContext_Explain">This policy setting specifies whether to enable User context execution or not.
168128

169-
If this policy is disabled or not configured, the default is No.</string>
129+
If this policy is disabled or not configured, the default is No.</string>
170130
<string id="MaxLogFiles_Name">Log: Number of allowed log files</string>
171-
<string id="MaxLogFiles_Explain">If this policy is enabled, you can set a number
172-
of allowed log files:
173-
Setting MaxLogFiles to 0 don't delete any old archived log files, 1 keeps
174-
the original one and just let it grow.
175-
Default number is 3 (0-99)
131+
<string id="MaxLogFiles_Explain">If this policy is enabled, you can set a number of allowed log files:
132+
Setting MaxLogFiles to 0 don't delete any old archived log files, 1 keeps the original one and just let it grow.
133+
Default number is 3 (0-99)
176134

177-
If this policy is disabled or not configured, the default number is used.</string>
135+
If this policy is disabled or not configured, the default number is used.</string>
178136
<string id="MaxLogSize_Name">Log: Size of the log file in bytes before rotating</string>
179-
<string id="MaxLogSize_Explain">If this policy is enabled, you can set the size of
180-
the log file in bytes before rotating.
181-
Default size is 1048576 = 1 MB
137+
<string id="MaxLogSize_Explain">If this policy is enabled, you can set the size of the log file in bytes before rotating.
138+
Default size is 1048576 = 1 MB
182139

183-
If this policy is disabled or not configured, the default size is used.</string>
140+
If this policy is disabled or not configured, the default size is used.</string>
184141
<string id="WingetSourceCustom_Name">Use custom Winget Source repository</string>
185-
<string id="WingetSourceCustom_Explain">This policy setting specifies whether to
186-
use winget tool with custom repository or not:
187-
(WAU - Check for updated Apps)
142+
<string id="WingetSourceCustom_Explain">This policy setting specifies whether to use winget tool with custom repository or not:
143+
(WAU - Check for updated Apps)
188144

189-
If this policy is enabled, WAU will TRY to use a custom repo instead of the
190-
built-in/default one called winget.
145+
If this policy is enabled, WAU will TRY to use a custom repo instead of the built-in/default one called winget.
191146

192-
If this policy is disabled or not configured, the default is always the
193-
built-in winget.</string>
147+
If this policy is disabled or not configured, the default is always the built-in winget.</string>
194148
<string id="UpdatesTimeDelay_Name">Random delay for scheduled task triggers</string>
195-
<string id="UpdatesTimeDelay_Explain">This policy setting specifies the delay for the
196-
scheduled task.
197-
A scheduled task random delay adds a random amount of wait time (up to the specified
198-
maximum) before the task starts.
199-
This helps prevent many devices from running the task at the exact same time. This is not
200-
applicable to "on logon" triggers.
149+
<string id="UpdatesTimeDelay_Explain">This policy setting specifies the delay for the scheduled task.
150+
A scheduled task random delay adds a random amount of wait time (up to the specified maximum) before the task starts.
151+
This helps prevent many devices from running the task at the exact same time. This is not applicable to "on logon" triggers.
201152

202-
If this policy is enabled, the scheduled task will have a random delay set
203-
based on the time inputted.
153+
If this policy is enabled, the scheduled task will have a random delay set based on the time inputted.
204154

205-
If this policy is disabled or not configured, the default no delay.</string>
155+
If this policy is disabled or not configured, the default no delay.</string>
206156
</stringTable>
207157
<presentationTable>
208158
<presentation id="BlackList">

0 commit comments

Comments
 (0)