Skip to content

Commit aee198a

Browse files
committed
Merge branch 'main' into maccruz-unifiedcustom
2 parents 8536730 + 20838e1 commit aee198a

File tree

67 files changed

+819
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+819
-208
lines changed

ATPDocs/troubleshooting-known-issues.md

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Troubleshooting known issues
33
description: Describes how you can troubleshoot issues in Microsoft Defender for Identity.
4-
ms.date: 09/02/2024
4+
ms.date: 05/08/2025
55
ms.topic: troubleshooting
66
---
77

@@ -117,31 +117,16 @@ The issue can be caused when the trusted root certification authorities certific
117117

118118
Run the following PowerShell cmdlet to verify that the required certificates are installed.
119119

120-
In the following example, use the "DigiCert Baltimore Root" certificate for all customers. In addition, use the "DigiCert Global Root G2" certificate for commercial customers or use the "DigiCert Global Root CA" certificate for US Government GCC High customers, as indicated.
120+
In the following example the "DigiCert Global Root G2" certificate is for commercial customers and the "DigiCert Global Root CA" certificate for US Government GCC High customers, as indicated.
121121

122122
```powershell
123-
# Certificate for all customers
124-
Get-ChildItem -Path "Cert:\LocalMachine\Root" | where { $_.Thumbprint -eq "D4DE20D05E66FC53FE1A50882C78DB2852CAE474"} | fl
125-
126123
# Certificate for commercial customers
127124
Get-ChildItem -Path "Cert:\LocalMachine\Root" | where { $_.Thumbprint -eq "df3c24f9bfd666761b268073fe06d1cc8d4f82a4"} | fl
128125
129126
# Certificate for US Government GCC High customers
130127
Get-ChildItem -Path "Cert:\LocalMachine\Root" | where { $_.Thumbprint -eq "a8985d3a65e5e5c4b2d7d66d40c6dd2fb19c5436"} | fl
131128
```
132129

133-
Output for certificate for all customers:
134-
135-
```Output
136-
Subject : CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
137-
Issuer : CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
138-
Thumbprint : D4DE20D05E66FC53FE1A50882C78DB2852CAE474
139-
FriendlyName : DigiCert Baltimore Root
140-
NotBefore : 5/12/2000 11:46:00 AM
141-
NotAfter : 5/12/2025 4:59:00 PM
142-
Extensions : {System.Security.Cryptography.Oid, System.Security.Cryptography.Oid, System.Security.Cryptography.Oid}
143-
```
144-
145130
Output for certificate for commercial customers certificate:
146131

147132
```Output
@@ -168,19 +153,14 @@ Extensions : {System.Security.Cryptography.Oid, System.Security.Cryptography.O
168153

169154
If you don't see the expected output, use the following steps:
170155

171-
1. Download the following certificates to the Server Core machine. For all customers, download the [Baltimore CyberTrust root](https://cacerts.digicert.com/BaltimoreCyberTrustRoot.crt) certificate.
172-
173-
In addition:
156+
1. Download the following certificates to the machine:
174157

175158
- For commercial customers, download the [DigiCert Global Root G2](https://cacerts.digicert.com/DigiCertGlobalRootG2.crt) certificate
176159
- For US Government GCC High customers, download the [DigiCert Global Root CA](https://cacerts.digicert.com/DigiCertGlobalRootCA.crt) certificate
177160

178161
1. Run the following PowerShell cmdlet to install the certificate.
179162

180163
```powershell
181-
# For all customers, install certificate
182-
Import-Certificate -FilePath "<PATH_TO_CERTIFICATE_FILE>\bc2025.crt" -CertStoreLocation Cert:\LocalMachine\Root
183-
184164
# For commercial customers, install certificate
185165
Import-Certificate -FilePath "<PATH_TO_CERTIFICATE_FILE>\DigiCertGlobalRootG2.crt" -CertStoreLocation Cert:\LocalMachine\Root
186166

defender-endpoint/TOC.yml

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@
55
- name: Zero Trust with Defender for Endpoint
66
href: zero-trust-with-microsoft-defender-endpoint.md
77
- name: Overview
8-
items:
9-
- name: What is Microsoft Defender for Endpoint?
10-
items:
11-
- name: Defender for Endpoint on Windows
12-
href: microsoft-defender-endpoint.md
13-
- name: Defender for Endpoint on macOS
14-
href: microsoft-defender-endpoint-mac.md
15-
- name: Defender for Endpoint on Linux
16-
href: microsoft-defender-endpoint-linux.md
17-
- name: Defender for Endpoint on Android
18-
href: microsoft-defender-endpoint-android.md
19-
- name: Defender for Endpoint on iOS
20-
href: microsoft-defender-endpoint-ios.md
21-
- name: Defender for Endpoint for US Government customers
22-
href: gov.md
23-
- name: Supported Defender for Endpoint capabilities by platform
24-
href: supported-capabilities-by-platform.md
25-
- name: Antivirus solution compatibility with Defender for Endpoint
26-
href: defender-compatibility.md
27-
- name: Defender for Endpoint Plan 1
28-
items:
29-
- name: Overview of Defender for Endpoint Plan 1
30-
href: defender-endpoint-plan-1.md
31-
- name: Setup and configuration
32-
href: mde-p1-setup-configuration.md
33-
- name: Get started
34-
href: mde-plan1-getting-started.md
8+
items:
9+
- name: Defender for Endpoint on Windows
10+
href: microsoft-defender-endpoint.md
11+
- name: Defender for Endpoint on macOS
12+
href: microsoft-defender-endpoint-mac.md
13+
- name: Defender for Endpoint on Linux
14+
href: microsoft-defender-endpoint-linux.md
15+
- name: Defender for Endpoint on Android
16+
href: microsoft-defender-endpoint-android.md
17+
- name: Defender for Endpoint on iOS
18+
href: microsoft-defender-endpoint-ios.md
19+
- name: Defender for Endpoint for US Government customers
20+
href: gov.md
21+
- name: Defender for Endpoint Plan 1
22+
items:
23+
- name: Overview of Defender for Endpoint Plan 1
24+
href: defender-endpoint-plan-1.md
25+
- name: Setup and configuration
26+
href: mde-p1-setup-configuration.md
27+
- name: Get started
28+
href: mde-plan1-getting-started.md
29+
- name: Minimum requirements
30+
href: minimum-requirements.md
31+
- name: Supported Defender for Endpoint capabilities by platform
32+
href: supported-capabilities-by-platform.md
33+
- name: Antivirus solution compatibility with Defender for Endpoint
34+
href: defender-compatibility.md
3535
- name: What's new in Defender for Endpoint
3636
href: whats-new-in-microsoft-defender-endpoint.md
3737
items:
@@ -47,8 +47,6 @@
4747
href: ios-whatsnew.md
4848
- name: Previous Defender for Endpoint releases (archive)
4949
href: whats-new-mde-archive.md
50-
- name: Minimum requirements
51-
href: minimum-requirements.md
5250
- name: Trial user guide - Defender for Endpoint
5351
href: defender-endpoint-trial-user-guide.md
5452
- name: Pilot and deploy Defender for Endpoint
@@ -311,7 +309,7 @@
311309
href: linux-resources.md
312310
- name: Mobile Threat Defense
313311
items:
314-
- name: Mobile Threat Defense Overview
312+
- name: Mobile Threat Defense overview
315313
href: mtd.md
316314
- name: Deploy
317315
items:

defender-endpoint/configure-real-time-protection-microsoft-defender-antivirus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: emmwalshh
88
ms.author: ewalsh
99
ms.reviewer: yongrhee
1010
ms.topic: conceptual
11-
ms.date: 04/03/2024
11+
ms.date: 05/08/2025
1212
manager: deniseb
1313
ms.custom: nextgen
1414
ms.collection:

defender-endpoint/device-discovery.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ms.service: defender-endpoint
55
ms.subservice: onboard
66
f1.keywords:
77
- NOCSH
8-
ms.author: deniseb
9-
author: denisebmsft
8+
ms.author: ewalsh
9+
author: emmwalshh
1010
ms.localizationpriority: medium
1111
manager: deniseb
1212
audience: ITPro
@@ -18,7 +18,7 @@ ms.collection:
1818
ms.custom: admindeeplinkDEFENDER
1919
ms.topic: conceptual
2020
search.appverid: met150
21-
ms.date: 04/23/2024
21+
ms.date: 05/08/2025
2222
---
2323

2424
# Device discovery overview

defender-endpoint/enable-attack-surface-reduction.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
- mde-asr
1616
ms.custom: admindeeplinkDEFENDER
1717
search.appverid: met150
18-
ms.date: 04/30/2025
18+
ms.date: 05/08/2025
1919
---
2020

2121
# Enable attack surface reduction rules
@@ -102,7 +102,7 @@ When adding exclusions, keep these points in mind:
102102

103103
If a conflicting policy is applied via MDM and GP, the setting applied from Group Policy takes precedence.
104104

105-
Attack surface reduction rules for managed devices now support behavior for merging settings from different policies to create a policy superset for each device. Only the settings that aren't in conflict are merged, whereas policy conficts aren't added to the superset of rules. Previously, if two policies included conflicts for a single setting, both policies were flagged as being in conflict, and no settings from either profile were deployed.
105+
Attack surface reduction rules for managed devices now support behavior for merging settings from different policies to create a policy superset for each device. Only the settings that aren't in conflict are merged, whereas policy conflicts aren't added to the superset of rules. Previously, if two policies included conflicts for a single setting, both policies were flagged as being in conflict, and no settings from either profile were deployed.
106106

107107
Attack surface reduction rule merge behavior works as follows:
108108

@@ -139,6 +139,7 @@ The following procedures for enabling attack surface reduction rules include ins
139139
> If you're using Intune on Windows Server 2012 R2 and Windows Server 2016 with the [modern unified solution](onboard-server.md#functionality-in-the-modern-unified-solution-for-windows-server-2016-and-windows-server-2012-r2), you need to set the following attack surface reduction rules to `Not Configured` because they're not supported on these OS versions. Otherwise, these policies fail to apply:
140140
> - [Block persistence through Windows Management Instrumentation (WMI) event subscription](/defender-endpoint/attack-surface-reduction-rules-reference#block-persistence-through-wmi-event-subscription)
141141
> - [Block JavaScript or VBScript from launching downloaded executable content](/defender-endpoint/attack-surface-reduction-rules-reference#block-javascript-or-vbscript-from-launching-downloaded-executable-content)
142+
> - [Block Win32 API calls from Office macro](/defender-endpoint/attack-surface-reduction-rules-reference#block-win32-api-calls-from-office-macros)
142143
143144
#### Endpoint security policy (Preferred)
144145

defender-endpoint/enable-controlled-folders.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
- tier3
1616
- mde-asr
1717
search.appverid: met150
18-
ms.date: 03/12/2025
18+
ms.date: 05/06/2025
1919
---
2020

2121
# Enable controlled folder access
@@ -85,7 +85,7 @@ Use the [./Vendor/MSFT/Policy/Config/ControlledFolderAccessProtectedFolders](/wi
8585

8686
1. After the policy is created, **Close**.
8787

88-
For more information about Microsoft Configuration Manager and Controlled Folder Access, please visit [Controlled folder access policies and options](/mem/configmgr/protect/deploy-use/create-deploy-exploit-guard-policy).
88+
For more information about Microsoft Configuration Manager and Controlled Folder Access, visit [Controlled folder access policies and options](/mem/configmgr/protect/deploy-use/create-deploy-exploit-guard-policy).
8989

9090
## Group Policy
9191

defender-endpoint/host-firewall-reporting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ title: Host firewall reporting in Microsoft Defender for Endpoint
33
description: Host and view firewall reporting in Microsoft Defender portal.
44
ms.service: defender-endpoint
55
ms.localizationpriority: medium
6-
ms.date: 04/11/2024
6+
ms.date: 05/08/2025
77
audience: ITPro
88
ms.topic: conceptual
9-
author: denisebmsft
10-
ms.author: deniseb
9+
author: emmwalshh
10+
ms.author: ewalsh
1111
manager: deniseb
1212
ms.subservice: asr
1313
ms.collection:

0 commit comments

Comments
 (0)