From d3392873d8e040f506188997c95caa9df8a96fe4 Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Thu, 29 May 2025 13:31:44 -0500
Subject: [PATCH] Updating Windows configuration profiles (#29590)

- Updating Windows configuration profiles to prevent race condition
---
 .../configuration-profiles/password.xml       | 13 ++++++++++
 .../configuration-profiles/screen-lock.xml    | 26 -------------------
 it-and-security/teams/workstations-canary.yml |  1 -
 3 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 it-and-security/lib/windows/configuration-profiles/screen-lock.xml

diff --git a/it-and-security/lib/windows/configuration-profiles/password.xml b/it-and-security/lib/windows/configuration-profiles/password.xml
index d4120cacaf..9e10173783 100644
--- a/it-and-security/lib/windows/configuration-profiles/password.xml
+++ b/it-and-security/lib/windows/configuration-profiles/password.xml
@@ -43,3 +43,16 @@
     <Data>1</Data>
   </Item>
 </Replace>
+<Replace>
+  <!-- Enforce screenlock after 15 minutes -->
+  <CmdID>2</CmdID>
+  <Item>
+    <Meta>
+      <Format xmlns="syncml:metinf">int</Format>
+    </Meta>
+    <Target>
+      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MaxInactivityTimeDeviceLock</LocURI>
+    </Target>
+    <Data>15</Data>
+  </Item>
+</Replace>
diff --git a/it-and-security/lib/windows/configuration-profiles/screen-lock.xml b/it-and-security/lib/windows/configuration-profiles/screen-lock.xml
deleted file mode 100644
index f242d4a1a4..0000000000
--- a/it-and-security/lib/windows/configuration-profiles/screen-lock.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Replace>
-  <!-- Enforce screenlock -->
-  <CmdID>1</CmdID>
-  <Item>
-    <Meta>
-      <Format xmlns="syncml:metinf">int</Format>
-    </Meta>
-    <Target>
-      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/DevicePasswordEnabled</LocURI>
-    </Target>
-    <Data>1</Data>
-  </Item>
-</Replace>
-<Replace>
-  <!-- Enforce screenlock after 15 minutes -->
-  <CmdID>2</CmdID>
-  <Item>
-    <Meta>
-      <Format xmlns="syncml:metinf">int</Format>
-    </Meta>
-    <Target>
-      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MaxInactivityTimeDeviceLock</LocURI>
-    </Target>
-    <Data>15</Data>
-  </Item>
-</Replace>
diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml
index eb9888c9df..c1c06e2fee 100644
--- a/it-and-security/teams/workstations-canary.yml
+++ b/it-and-security/teams/workstations-canary.yml
@@ -112,7 +112,6 @@ controls:
     custom_settings:
       - path: ../lib/windows/configuration-profiles/enable-firewall-all-domains.xml
       - path: ../lib/windows/configuration-profiles/password.xml
-      - path: ../lib/windows/configuration-profiles/screen-lock.xml
       - path: ../lib/windows/configuration-profiles/advanced-logging-powershell.xml
       - path: ../lib/windows/configuration-profiles/autoset-time-date.xml
       - path: ../lib/windows/configuration-profiles/disable-onedrive.xml