Merge pull request #875 from Microsoft/maricia-12037677

Maricia 12037677

windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md

@@ -1239,6 +1239,14 @@ Also Added [Firewall DDF file](firewall-ddf-file.md).</td></tr>
 <li>Power/StandbyTimeoutPluggedIn</li>
 </ul>
 </td></tr>
+<tr class="odd">
+<td style="vertical-align:top">[WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)</td>
+<td style="vertical-align:top">Updated the CSP in Windows 10, version 1709. Added the following settings:
+<ul>
+<li>DeviceTagging/Group</li>
+<li>DeviceTagging/Criticality</li>
+</ul>
+</td></tr>
 </tbody>
 </table>
 

windows/client-management/mdm/windowsadvancedthreatprotection-csp.md

@@ -91,6 +91,28 @@ The following list describes the characteristics and parameters.
 
 <p style="margin-left: 20px">Supported operations are Get and Replace.
 
+<a href="" id="devicetagging"></a>**DeviceTagging**  
+<p style="margin-left: 20px">Added in Windows 10, version 1709. Represents Windows Defender Advanced Threat Protection configuration for managing role based access and device tagging.
+
+<p style="margin-left: 20px">Supported operations is Get.
+
+<a href="" id="group"></a>**DeviceTagging/Group**  
+<p style="margin-left: 20px">Added in Windows 10, version 1709. Device group identifiers.
+
+<p style="margin-left: 20px">The data type is a string.
+
+<p style="margin-left: 20px">Supported operations are Get and Replace.
+
+<a href="" id="criticality"></a>**DeviceTagging/Criticality**  
+<p style="margin-left: 20px">Added in Windows 10, version 1709. Asset criticality value. Supported values:  
+
+- 0 - Normal
+- 1 - Critical
+
+<p style="margin-left: 20px">The data type is an integer.
+
+<p style="margin-left: 20px">Supported operations are Get and Replace.
+
 ## Examples
 
 
@@ -98,7 +120,7 @@ The following list describes the characteristics and parameters.
 <SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Get>
-      <CmdID>11</CmdID>
+      <CmdID>111</CmdID>
       <Item>
         <Target>
           <LocURI>
@@ -167,6 +189,26 @@ The following list describes the characteristics and parameters.
         </Target>
       </Item>
     </Get>
+    <Get>
+      <CmdID>11</CmdID>
+      <Item>
+        <Target>
+          <LocURI>
+            ./Device/Vendor/MSFT/WindowsAdvancedThreatProtection/DeviceTagging/Group
+          </LocURI>
+        </Target>
+      </Item>
+    </Get>
+    <Get>
+      <CmdID>12</CmdID>
+      <Item>
+        <Target>
+          <LocURI>
+            ./Device/Vendor/MSFT/WindowsAdvancedThreatProtection/DeviceTagging/Criticality
+          </LocURI>
+        </Target>
+      </Item>
+    </Get>
     <Get>
       <CmdID>99</CmdID>
       <Item>

windows/client-management/mdm/windowsadvancedthreatprotection-ddf.md

@@ -45,7 +45,7 @@ The XML below is the current version for this CSP.
             <Permanent />
           </Scope>
           <DFType>
-            <MIME>com.microsoft/1.1/MDM/WindowsAdvancedThreatProtection</MIME>
+            <MIME>com.microsoft/1.2/MDM/WindowsAdvancedThreatProtection</MIME>
           </DFType>
         </DFProperties>
         <Node>
@@ -267,6 +267,75 @@ The XML below is the current version for this CSP.
             </DFType>
           </DFProperties>
         </Node>
+        <Node>
+          <NodeName>DeviceTagging</NodeName>
+          <DFProperties>
+            <AccessType>
+              <Get />
+            </AccessType>
+            <Description>Represents Windows Defender Advanced Threat Protection configuration for managing role base access and device tagging</Description>
+            <DFFormat>
+              <node />
+            </DFFormat>
+            <Occurrence>
+              <One />
+            </Occurrence>
+            <Scope>
+              <Permanent />
+            </Scope>
+            <DFTitle>Device Tagging</DFTitle>
+            <DFType>
+              <DDFName></DDFName>
+            </DFType>
+          </DFProperties>
+          <Node>
+            <NodeName>Group</NodeName>
+            <DFProperties>
+              <AccessType>
+                <Get />
+                <Replace />
+              </AccessType>
+              <Description>Device group identifiers</Description>
+              <DFFormat>
+                <chr />
+              </DFFormat>
+              <Occurrence>
+                <One />
+              </Occurrence>
+              <Scope>
+                <Permanent />
+              </Scope>
+              <DFTitle>Device Group Identifier</DFTitle>
+              <DFType>
+                <MIME>text/plain</MIME>
+              </DFType>
+            </DFProperties>
+          </Node>
+          <Node>
+            <NodeName>Criticality</NodeName>
+            <DFProperties>
+              <AccessType>
+                <Get />
+                <Replace />
+              </AccessType>
+              <DefaultValue>0</DefaultValue>
+              <Description>Asset criticality value. 0 - Normal, 1 - Critical.</Description>
+              <DFFormat>
+                <int />
+              </DFFormat>
+              <Occurrence>
+                <One />
+              </Occurrence>
+              <Scope>
+                <Permanent />
+              </Scope>
+              <DFTitle>Device Criticality</DFTitle>
+              <DFType>
+                <MIME>text/plain</MIME>
+              </DFType>
+            </DFProperties>
+          </Node>
+        </Node>
       </Node>
 </MgmtTree>
 ```