Mods Template/Functions and Lists in GPO + more...

Policies/WAU.admx

@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="4.4" schemaVersion="1.0">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="4.7" xsi:schemaLocation="" schemaVersion="1.0" xmlns="http://www.microsoft.com/GroupPolicy/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="WAU" namespace="Romanitho.Policies.WAU"/>
-    <using prefix="Romanitho" namespace="Romanitho.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="4.4"/>
+  <resources minRequiredRevision="4.7" fallbackCulture="en-us"/>
   <supportedOn>
     <definitions>
-      <definition name="SUPPORTED_WAU_1_15_3" displayName="$(string.SUPPORTED_WAU_1_15_3)"/>
+      <definition name="SUPPORTED_WAU_1_16_0" displayName="$(string.SUPPORTED_WAU_1_16_0)"/>
     </definitions>
   </supportedOn>
-  <categories>
-    <category displayName="$(string.WAU)" name="WAU">
-      <parentCategory ref="Romanitho:Cat_Romanitho"/>
-    </category>
-  </categories>
+  <categories><category displayName="$(string.WAU)" name="WAU"/></categories>
   <policies>
   	<policy name="ActivateGPOManagement_Enable" class="Machine" displayName="$(string.ActivateGPOManagement_Name)" explainText="$(string.ActivateGPOManagement_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_ActivateGPOManagement">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -28,7 +23,7 @@
     </policy>
   	<policy name="BypassListForUsers_Enable" class="Machine" displayName="$(string.BypassListForUsers_Name)" explainText="$(string.BypassListForUsers_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_BypassListForUsers">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -38,7 +33,7 @@
     </policy>
   	<policy name="DisableAutoUpdate_Enable" class="Machine" displayName="$(string.DisableAutoUpdate_Name)" explainText="$(string.DisableAutoUpdate_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_DisableAutoUpdate">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -48,7 +43,7 @@
     </policy>
   	<policy name="DoNotRunOnMetered_Enable" class="Machine" displayName="$(string.DoNotRunOnMetered_Name)" explainText="$(string.DoNotRunOnMetered_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_DoNotRunOnMetered">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="0" />
       </enabledValue>
@@ -58,17 +53,31 @@
     </policy>
   	<policy name="UpdatePrerelease_Enable" class="Machine" displayName="$(string.UpdatePrerelease_Name)" explainText="$(string.UpdatePrerelease_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_UpdatePrerelease">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
       <disabledValue>
         <decimal value="0" />
       </disabledValue>
+    </policy>
+    <policy name="BlackList_Enable" class="Machine" displayName="$(string.BlackList_Name)" explainText="$(string.BlackList_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.BlackList)">
+      <parentCategory ref="WAU"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
+      <elements>
+        <list id="BlackList" key="Software\Policies\Romanitho\Winget-AutoUpdate\BlackList" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="WhiteList_Enable" class="Machine" displayName="$(string.WhiteList_Name)" explainText="$(string.WhiteList_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.WhiteList)">
+      <parentCategory ref="WAU"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
+      <elements>
+        <list id="WhiteList" key="Software\Policies\Romanitho\Winget-AutoUpdate\WhiteList" valuePrefix=""/>
+      </elements>
     </policy>
   	<policy name="UseWhiteList_Enable" class="Machine" displayName="$(string.UseWhiteList_Name)" explainText="$(string.UseWhiteList_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_UseWhiteList">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -78,21 +87,21 @@
     </policy>
     <policy name="ListPath_Enable" class="Machine" displayName="$(string.ListPath_Name)" explainText="$(string.ListPath_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.ListPath)" >
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <text id="ListPath" valueName="WAU_ListPath" />
       </elements>
     </policy>
     <policy name="ModsPath_Enable" class="Machine" displayName="$(string.ModsPath_Name)" explainText="$(string.ModsPath_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.ModsPath)" >
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <text id="ModsPath" valueName="WAU_ModsPath" />
       </elements>
     </policy>
     <policy name="NotificationLevel_Enable" class="Machine" displayName="$(string.NotificationLevel_Name)" explainText="$(string.NotificationLevel_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate"  presentation="$(presentation.NotificationLevel)">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <enum id="NotificationLevel" valueName="WAU_NotificationLevel">
           <item displayName="$(string.NotificationLevel_Full)">
@@ -115,7 +124,7 @@
     </policy>
     <policy name="UpdatesInterval_Enable" class="Machine" displayName="$(string.UpdatesInterval_Name)" explainText="$(string.UpdatesInterval_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate"  presentation="$(presentation.UpdatesInterval)">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <enum id="UpdatesInterval" valueName="WAU_UpdatesInterval">
           <item displayName="$(string.UpdatesInterval_Daily)">
@@ -153,7 +162,7 @@
     </policy>
   	<policy name="UpdatesAtLogon_Enable" class="Machine" displayName="$(string.UpdatesAtLogon_Name)" explainText="$(string.UpdatesAtLogon_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_UpdatesAtLogon">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -163,7 +172,7 @@
     </policy>
     <policy name="UpdatesAtTime_Enable" class="Machine" displayName="$(string.UpdatesAtTime_Name)" explainText="$(string.UpdatesAtTime_Explain)" presentation="$(presentation.UpdatesAtTime)" key="Software\Policies\Romanitho\Winget-AutoUpdate">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <enum id="UpdatesAtTime" valueName="WAU_UpdatesAtTime">
           <item displayName="$(string.UpdatesAtTime01)">
@@ -291,7 +300,7 @@
     </policy>
   	<policy name="UserContext_Enable" class="Machine" displayName="$(string.UserContext_Name)" explainText="$(string.UserContext_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_UserContext">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -301,7 +310,7 @@
     </policy>
   	<policy name="DesktopShortcut_Enable" class="Machine" displayName="$(string.DesktopShortcut_Name)" explainText="$(string.DesktopShortcut_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_DesktopShortcut">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -311,7 +320,7 @@
     </policy>
   	<policy name="StartMenuShortcut_Enable" class="Machine" displayName="$(string.StartMenuShortcut_Name)" explainText="$(string.StartMenuShortcut_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" valueName="WAU_StartMenuShortcut">
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <enabledValue>
         <decimal value="1" />
       </enabledValue>
@@ -321,14 +330,14 @@
     </policy>
     <policy name="MaxLogFiles_Name" class="Machine" displayName="$(string.MaxLogFiles_Name)" explainText="$(string.MaxLogFiles_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.MaxLogFiles)" >
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <text id="MaxLogFiles" valueName="WAU_MaxLogFiles" />
       </elements>
     </policy>
     <policy name="MaxLogSize_Name" class="Machine" displayName="$(string.MaxLogSize_Name)" explainText="$(string.MaxLogSize_Explain)" key="Software\Policies\Romanitho\Winget-AutoUpdate" presentation="$(presentation.MaxLogSize)" >
       <parentCategory ref="WAU"/>
-      <supportedOn ref="WAU:SUPPORTED_WAU_1_15_3"/>
+      <supportedOn ref="WAU:SUPPORTED_WAU_1_16_0"/>
       <elements>
         <text id="MaxLogSize" valueName="WAU_MaxLogSize" />
       </elements>

Policies/en-US/WAU.adml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="4.4" schemaVersion="1.0" >
-  <displayName/>
-  <description/>
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="4.7" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+  <displayName>WinGet-AutoUpdate</displayName>
+  <description>WinGet-AutoUpdate GPO Management</description>
   <resources >
     <stringTable >
       <string id="WAU">Winget-AutoUpdate</string>
-      <string id="SUPPORTED_WAU_1_15_3">Winget-AutoUpdate version 1.15.3 or later</string>
+      <string id="SUPPORTED_WAU_1_16_0">Winget-AutoUpdate version 1.16.0 or later</string>
       <string id="ActivateGPOManagement_Name">Activate WAU GPO Management</string>
       <string id="ActivateGPOManagement_Explain">This policy setting is an overriding toggle for GPO Management of Winget-AutoUpdate.</string>
       <string id="BypassListForUsers_Name">Bypass Black/White list for User</string>
@@ -26,13 +26,22 @@ If this policy is disabled or not configured, the default is No.</string>
       <string id="UpdatePrerelease_Explain">This policy setting specifies whether to update WAU to PreRelease versions or not (via WAU AutoUpdate).
 
 If this policy is disabled or not configured, the default is No.</string>
+      <string id="BlackList_Name">Application GPO Blacklist</string>
+      <string id="BlackList_Explain">Provide the WinGet IDs of applications you want to exclude.
+
+If this policy is disabled or not configured, GPO Blacklist is not used.</string>
+      <string id="WhiteList_Name">Application GPO Whitelist</string>
+      <string id="WhiteList_Explain">Provide the WinGet IDs of applications you want to include.
+
+If this policy is disabled or not configured, GPO Whitelist is not used.</string>
       <string id="UseWhiteList_Name">Use WhiteList instead of BlackList</string>
-      <string id="UseWhiteList_Explain">This policy setting specifies whether to use a WhiteList or not.
+      <string id="UseWhiteList_Explain">This policy setting specifies whether to use a Whitelist or not.
 
 If this policy is disabled or not configured, the default is No.</string>
-      <string id="ListPath_Name">Get Black/White List from external Path (URL/UNC/Local)</string>
-      <string id="ListPath_Explain">If this policy is enabled, you can set a (URL/UNC/Local) Path to external lists other than the default.
-
+      <string id="ListPath_Name">Get Black/White List from external Path (URL/UNC/GPO/Local)</string>
+      <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.
+If "Application GPO Blacklist/Whitelist" is set in this GPO the Path can be: GPO
+
 If this policy is disabled or not configured, the default ListPath is used (WAU InstallLocation).</string>
       <string id="ModsPath_Name">Get Mods from external Path (URL/UNC/Local)</string>
       <string id="ModsPath_Explain">If this policy is enabled, you can set a (URL/UNC/Local) Path to external mods other than the default.
@@ -126,9 +135,15 @@ Default size is 1048576 = 1 MB
 If this policy is disabled or not configured, the default size is used.</string>
     </stringTable>
     <presentationTable>
+      <presentation id="BlackList">
+        <listBox refId="BlackList">BlackList:</listBox>
+      </presentation>
+      <presentation id="WhiteList">
+        <listBox refId="WhiteList">WhiteList:</listBox>
+      </presentation>
       <presentation id="ListPath">
         <textBox refId="ListPath">
-          <label>(URL/UNC/Local) Path:</label>
+          <label>(URL/UNC/GPO/Local) Path:</label>
         </textBox>
       </presentation>
       <presentation id="ModsPath">

README.md

@@ -81,7 +81,7 @@ Setting it to 1 keeps the original one and just let it grow.
 
 **-MaxLogSize**  
 Specify the size of the log file in bytes before rotating.  
-Default is 1048576 = 1 MB
+Default is 1048576 = 1 MB (ca. 8000 lines)
 
 **-WingetUpdatePath**  
 Specify Winget-AutoUpdate installation location. Default: `C:\ProgramData\Winget-AutoUpdate` (Recommended to leave default).
@@ -96,7 +96,9 @@ Disable Winget-AutoUpdate update checking. By default, WAU auto updates if new v
 Use White List instead of Black List. This setting will not create the "excluded_apps.txt" but "included_apps.txt".
 
 **-ListPath**  
-Get Black/White List from external Path (**URL/UNC/Local**) - download/copy to Winget-AutoUpdate installation location if external list is newer.
+Get Black/White List from external Path (**URL/UNC/GPO/Local**) - download/copy to Winget-AutoUpdate installation location if external list is newer.  
+If `-ListPath` is set to **GPO** the Black/White List can be managed from within the GPO itself under **Application GPO Blacklist**/**Application GPO Whitelist**.  
+Thanks to [Weatherlights](https://github.com/Weatherlights) in [#256 (reply in thread)](https://github.com/Romanitho/Winget-AutoUpdate/discussions/256#discussioncomment-4710599)!
 
 **-ModsPath**  
 Get Mods from external Path (**URL/UNC/Local**) - download/copy to `mods` in Winget-AutoUpdate installation location if external mods are newer.  
@@ -185,7 +187,7 @@ The **GPO ADMX/ADML** validated with:
 [Windows 10 - Validate ADMX for Ingestion](https://developer.vmware.com/samples/7115/windows-10---validate-admx-for-ingestion)  
 Read more in the `README.md` under the directory **Policies**.
 
-![image](https://user-images.githubusercontent.com/102996177/212422844-9366c6aa-ee7a-490f-97f0-bffb5ab146ab.png)
+![image](https://user-images.githubusercontent.com/102996177/213920242-7ff8e2b4-d926-4407-b860-1e5922e29c3e.png)
 
 ## Help
 In some cases, you need to "unblock" the `install.bat` file (Windows Defender SmartScreen). Right click, properties and unblock. Then, you'll be able to run it.

Winget-AutoUpdate-Install.ps1

@@ -185,7 +185,8 @@ function Install-WinGet {
     #Check Package Install
     $TestWinGet = Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq "Microsoft.DesktopAppInstaller" }
 
-    If ([Version]$TestWinGet.Version -ge "2022.927.3.0") {
+    #Current: v1.4.10173 = 1.19.10173.0 = 2023.118.406.0
+    If ([Version]$TestWinGet.Version -ge "2023.118.406.0") {
 
         Write-Host "WinGet is Installed" -ForegroundColor Green
 
@@ -194,7 +195,7 @@ function Install-WinGet {
 
         #Download WinGet MSIXBundle
         Write-Host "-> Not installed. Downloading WinGet..."
-        $WinGetURL = "https://github.com/microsoft/winget-cli/releases/download/v1.3.2691/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
+        $WinGetURL = "https://github.com/microsoft/winget-cli/releases/download/v1.4.10173/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
         $WebClient = New-Object System.Net.WebClient
         $WebClient.DownloadFile($WinGetURL, "$PSScriptRoot\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle")
 

Winget-AutoUpdate/User-Run.ps1

@@ -85,11 +85,15 @@ else {
 		#Test if there was a list_/winget_error
 		if (Test-Path "$WorkingDir\logs\error.txt") {
 			$MessageType = "error"
+			$Critical = Get-Content "$WorkingDir\logs\error.txt" -Raw
+			$Critical = $Critical.Trim()
+			$Critical = $Critical.Substring(0, [Math]::Min($Critical.Length, 50))
+			$Message = "Critical:`n$Critical..."
 		}
 		else {
 			$MessageType = "success"
+			$Message = $NotifLocale.local.outputs.output[9].message
 		}
-		$Message = $NotifLocale.local.outputs.output[9].message
 		Start-NotifTask -Message $Message -MessageType $MessageType -Button1Text $Button1Text -Button1Action $OnClickAction -ButtonDismiss
 	}
 	catch {