From 21fa9eb25d135850358fad5c7c230fcd6c77c216 Mon Sep 17 00:00:00 2001
From: KnifMelti <gaj@knifmelti.se>
Date: Thu, 19 Jan 2023 01:54:05 +0100
Subject: [PATCH] Added Lists in GPO - not active yet

---
 Policies/WAU.admx       | 25 +++++++++++++++++--------
 Policies/en-US/WAU.adml | 20 ++++++++++++++++----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/Policies/WAU.admx b/Policies/WAU.admx
index c4aa293..8b6512f 100644
--- a/Policies/WAU.admx
+++ b/Policies/WAU.admx
@@ -1,20 +1,15 @@
 <?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.4" 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.4" fallbackCulture="en-us"/>
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_WAU_1_15_3" displayName="$(string.SUPPORTED_WAU_1_15_3)"/>
     </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"/>
@@ -65,6 +60,20 @@
       <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_15_3"/>
+      <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_15_3"/>
+      <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"/>
diff --git a/Policies/en-US/WAU.adml b/Policies/en-US/WAU.adml
index f3a10c7..afcb660 100644
--- a/Policies/en-US/WAU.adml
+++ b/Policies/en-US/WAU.adml
@@ -1,7 +1,7 @@
 <?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.4" 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>
@@ -26,8 +26,14 @@ 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 Blacklist</string>
+      <string id="BlackList_Explain">Provide the WinGet IDs of applications you want to exclude.</string>
+
+      <string id="WhiteList_Name">Application Whitelist</string>
+      <string id="WhiteList_Explain">Provide the WinGet IDs of applications you want to include.</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>
@@ -126,6 +132,12 @@ 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>