Skip to content

Commit

Permalink
Merge pull request #10209 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
10:30 AM main to live publish 9/13
  • Loading branch information
rjagiewich authored Sep 13, 2024
2 parents 23a8369 + 454f9c1 commit 69e9c6b
Show file tree
Hide file tree
Showing 11 changed files with 231 additions and 156 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: EnterpriseModernAppManagement CSP
description: Learn more about the EnterpriseModernAppManagement CSP.
ms.date: 09/03/2024
ms.date: 09/11/2024
---

<!-- Auto-Generated CSP Document -->
Expand Down Expand Up @@ -384,8 +384,6 @@ This is a required node. The following list shows the supported deployment optio
- LicenseUri="\\server\license.lic". Deploys an offline license. Available in 1607.
- ValidateDependencies="1". This option is used at provisioning/staging time. If it's set to 1, deployment will perform the same dependency validation during staging that we would normally do at registration time, failing and rejecting the provision request if the dependencies aren't present. Available in the latest insider flight of 20H1.
- ExcludeAppFromLayoutModification="1". Sets that the app will be provisioned on all devices and will be able to retain the apps provisioned without pinning them to start layout. Available in 1809.


<!-- Device-AppInstallation-{PackageFamilyName}-HostedInstall-Editable-End -->

<!-- Device-AppInstallation-{PackageFamilyName}-HostedInstall-DFProperties-Begin -->
Expand Down Expand Up @@ -1018,8 +1016,6 @@ This is a required node. Query parameters:
- Publisher - specifies the publisher of a particular package. If you specify this parameter, it returns the publisher if the value exists in the Publisher field.

If you don't specify this value, then all publishers are returned.


<!-- Device-AppManagement-AppInventoryQuery-Editable-End -->

<!-- Device-AppManagement-AppInventoryQuery-DFProperties-Begin -->
Expand Down Expand Up @@ -5996,7 +5992,6 @@ Identifier for the entity that requested the license, such as the client who acq
<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
> [!NOTE]
> The Microsoft Store for Business and Microsoft Store for Education are retired. For more information, see [Microsoft Store for Business and Education retiring March 31, 2023](/lifecycle/announcements/microsoft-store-for-business-education-retiring).

<!-- User-AppLicenses-StoreLicenses-{LicenseID}-RequesterID-Editable-End -->

<!-- User-AppLicenses-StoreLicenses-{LicenseID}-RequesterID-DFProperties-Begin -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: EnterpriseModernAppManagement DDF file
description: View the XML file containing the device description framework (DDF) for the EnterpriseModernAppManagement configuration service provider.
ms.date: 09/03/2024
ms.date: 09/11/2024
---

<!-- Auto-Generated CSP Document -->
Expand Down Expand Up @@ -2462,7 +2462,7 @@ The following XML file contains the device description framework (DDF) for the E
<AccessType>
<Get />
</AccessType>
<Description>Category of license that is used to classify various license sources. Valid value: Unknown - unknown license category. Retail - license sold through retail channels, typically from the Microsoft Store. Enterprise - license sold through the enterprise sales channel. OEM - license issued to an OEM. Developer - developer license, typically installed during the app development or side-loading scenarios.</Description>
<Description>Category of license that is used to classify various license sources. Valid value: Unknown - unknown license category. Retail - license sold through retail channels, typically from the Microsoft Store. Enterprise - license sold through the enterprise sales channel, typically from the Store for Business. OEM - license issued to an OEM. Developer - developer license, typically installed during the app development or side-loading scenarios.</Description>
<DFFormat>
<chr />
</DFFormat>
Expand Down Expand Up @@ -2504,7 +2504,7 @@ The following XML file contains the device description framework (DDF) for the E
<AccessType>
<Get />
</AccessType>
<Description>Identifier for the entity that requested the license, such as the client who acquired the license. Note that all licenses for a particular enterprise client can have the same RequesterID.</Description>
<Description>Identifier for the entity that requested the license, such as the client who acquired the license. For example, all licenses issued by the Store for Business for a particular enterprise client has the same RequesterID.</Description>
<DFFormat>
<chr />
</DFFormat>
Expand Down Expand Up @@ -5286,7 +5286,7 @@ The following XML file contains the device description framework (DDF) for the E
<AccessType>
<Get />
</AccessType>
<Description>Category of license that is used to classify various license sources. Valid value: Unknown - unknown license category. Retail - license sold through retail channels, typically from the Microsoft Store. Enterprise - license sold through the enterprise sales channel. OEM - license issued to an OEM. Developer - developer license, typically installed during the app development or side-loading scenarios.</Description>
<Description>Category of license that is used to classify various license sources. Valid value: Unknown - unknown license category. Retail - license sold through retail channels, typically from the Microsoft Store. Enterprise - license sold through the enterprise sales channel, typically from the Store for Business. OEM - license issued to an OEM. Developer - developer license, typically installed during the app development or side-loading scenarios.</Description>
<DFFormat>
<chr />
</DFFormat>
Expand Down Expand Up @@ -5328,7 +5328,7 @@ The following XML file contains the device description framework (DDF) for the E
<AccessType>
<Get />
</AccessType>
<Description>Identifier for the entity that requested the license, such as the client who acquired the license. Note that licenses issued for a particular enterprise client can have the same RequesterID.</Description>
<Description>Identifier for the entity that requested the license, such as the client who acquired the license. For example, all licenses issued by the Store for Business for a particular enterprise client has the same RequesterID.</Description>
<DFFormat>
<chr />
</DFFormat>
Expand Down
4 changes: 2 additions & 2 deletions windows/client-management/mdm/policies-in-preview.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Configuration service provider preview policies
description: Learn more about configuration service provider (CSP) policies that are available for Windows Insider Preview.
ms.date: 08/07/2024
ms.date: 09/11/2024
---

<!-- Auto-Generated CSP Document -->
Expand Down Expand Up @@ -164,7 +164,7 @@ This article lists the policies that are applicable for Windows Insider Preview
- [SystemCryptography_ForceStrongKeyProtection](policy-csp-localpoliciessecurityoptions.md#systemcryptography_forcestrongkeyprotection)
- [SystemObjects_RequireCaseInsensitivityForNonWindowsSubsystems](policy-csp-localpoliciessecurityoptions.md#systemobjects_requirecaseinsensitivityfornonwindowssubsystems)
- [SystemObjects_StrengthenDefaultPermissionsOfInternalSystemObjects](policy-csp-localpoliciessecurityoptions.md#systemobjects_strengthendefaultpermissionsofinternalsystemobjects)
- [UserAccountControl_BehaviorOfTheElevationPromptForEnhancedAdministrators](policy-csp-localpoliciessecurityoptions.md#useraccountcontrol_behavioroftheelevationpromptforenhancedadministrators)
- [UserAccountControl_BehaviorOfTheElevationPromptForAdministratorProtection](policy-csp-localpoliciessecurityoptions.md#useraccountcontrol_behavioroftheelevationpromptforadministratorprotection)
- [UserAccountControl_TypeOfAdminApprovalMode](policy-csp-localpoliciessecurityoptions.md#useraccountcontrol_typeofadminapprovalmode)

## MixedReality
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: ApplicationDefaults Policy CSP
description: Learn more about the ApplicationDefaults Area in Policy CSP.
ms.date: 01/18/2024
ms.date: 09/11/2024
---

<!-- Auto-Generated CSP Document -->
Expand Down Expand Up @@ -31,13 +31,12 @@ ms.date: 01/18/2024
<!-- DefaultAssociationsConfiguration-Description-Begin -->
<!-- Description-Source-DDF-Forced -->
This policy allows an administrator to set default file type and protocol associations. When set, default associations will be applied on sign-in to the PC. The association file can be created using the DISM tool (dism /online /export-defaultappassociations:appassoc.xml). The file can be further edited by adding attributes to control how often associations are applied by the policy. The file then needs to be base64 encoded before being added to SyncML. If policy is enabled and the client machine is Microsoft Entra joined, the associations assigned in SyncML will be processed and default associations will be applied.

> [!NOTE]
> For this policy, MDM policy take precedence over group policies even when [MDMWinsOverGP](policy-csp-controlpolicyconflict.md#mdmwinsovergp) policy is not set.
<!-- DefaultAssociationsConfiguration-Description-End -->

<!-- DefaultAssociationsConfiguration-Editable-Begin -->
<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
> [!NOTE]
> For this policy, MDM policy take precedence over group policies even when [MDMWinsOverGP](policy-csp-controlpolicyconflict.md#mdmwinsovergp) policy is not set.
<!-- DefaultAssociationsConfiguration-Editable-End -->
<!-- DefaultAssociationsConfiguration-DFProperties-Begin -->
Expand Down
4 changes: 2 additions & 2 deletions windows/client-management/mdm/policy-csp-browser.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Browser Policy CSP
description: Learn more about the Browser Area in Policy CSP.
ms.date: 09/03/2024
ms.date: 09/11/2024
---

<!-- Auto-Generated CSP Document -->
Expand Down Expand Up @@ -1481,7 +1481,7 @@ Sideloading installs and runs unverified extensions in Microsoft Edge. With this

If enabled or not configured, sideloading of unverified extensions in Microsoft Edge is allowed.

If disabled, sideloading of unverified extensions in Microsoft Edge isn't allowed. Extensions can be installed only through Microsoft store, enterprise storefront (such as Company Portal) or PowerShell (using Add-AppxPackage). When disabled, this policy doesn't prevent sideloading of extensions using Add-AppxPackage via PowerShell. To prevent this, in Group Policy Editor, enable Allows development of Windows Store apps and installing them from an integrated development environment (IDE), which is located at:
If disabled, sideloading of unverified extensions in Microsoft Edge isn't allowed. Extensions can be installed only through Microsoft store (including a store for business), enterprise storefront (such as Company Portal) or PowerShell (using Add-AppxPackage). When disabled, this policy doesn't prevent sideloading of extensions using Add-AppxPackage via PowerShell. To prevent this, in Group Policy Editor, enable Allows development of Windows Store apps and installing them from an integrated development environment (IDE), which is located at:

Computer Configuration > Administrative Templates > Windows Components > App Package Deployment.

Expand Down
Loading

0 comments on commit 69e9c6b

Please sign in to comment.