Merge branch 'main' into jdaly-main-work-with-data

Author: JimDaly

.openpublishing.redirection.json

@@ -1,5 +1,65 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/build-queries-with-queryexpression.md",
+      "redirect_url": "queryexpression/overview",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-queryexpression-class.md",
+      "redirect_url": "queryexpression/overview",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-conditionexpression-class.md",
+      "redirect_url": "queryexpression/filter-rows",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-filterexpression-class.md",
+      "redirect_url": "queryexpression/filter-rows",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-the-columnset-class.md",
+      "redirect_url": "queryexpression/select-columns",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/page-large-result-sets-with-queryexpression.md",
+      "redirect_url": "queryexpression/page-results",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-left-outer-join-queryexpression-query-records-not-in.md",
+      "redirect_url": "queryexpression/join-tables#find-records-not-in-a-set",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-conditionexpression-class.md#column-comparison",
+      "redirect_url": "queryexpression/filter-rows#filter-on-column-values-in-the-same-row",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-conditionexpression-class.md#record-count",
+      "redirect_url": "queryexpression/count-rows",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-filterexpression-class.md#about-the-isquickfindfilter-property",
+      "redirect_url": "quick-find",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/use-queryexpression-class.md#use-sql-hints-in-a-query",
+      "redirect_url": "queryexpression/optimize-performance#query-hints",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/org-service/build-queries-with-queryexpression.md#configuration-for-quick-find",
+      "redirect_url": "quick-find",
+      "redirect_document_id": "false"
+    },
     {
       "source_path": "powerapps-docs/developer/data-platform/tools/devtools-create-plugin.md",
       "redirect_url": "/power-platform/developer/howto/vs-create-plugin",

powerapps-docs/developer/data-platform/attachment-annotation-files.md

@@ -1005,7 +1005,7 @@ More information:
 
 - [Use the SDK for .NET](org-service/overview.md)
 - [IOrganizationService.RetrieveMultiple Method](xref:Microsoft.Xrm.Sdk.IOrganizationService.RetrieveMultiple%2A)
-- [Build queries with QueryExpression](org-service/build-queries-with-queryexpression.md)
+- [Build queries with QueryExpression](org-service/queryexpression/overview.md)
 
 
 # [Web API](#tab/webapi)
@@ -1081,7 +1081,7 @@ More information:
 
 - [Use the SDK for .NET](org-service/overview.md)
 - [IOrganizationService.RetrieveMultiple Method](xref:Microsoft.Xrm.Sdk.IOrganizationService.RetrieveMultiple%2A)
-- [Build queries with QueryExpression](org-service/build-queries-with-queryexpression.md)
+- [Build queries with QueryExpression](org-service/queryexpression/overview.md)
 - [IOrganizationService.Update Method](xref:Microsoft.Xrm.Sdk.IOrganizationService.Update%2A)
 
 # [Web API](#tab/webapi)

powerapps-docs/developer/data-platform/auditing/retrieve-audit-data.md

@@ -321,7 +321,7 @@ static void ShowNumberContactsDeletedByUserQE(
 
 Learn more about:
 
-- [Build queries with QueryExpression](../org-service/build-queries-with-queryexpression.md)
+- [Build queries with QueryExpression](../org-service/queryexpression/overview.md)
 
 
 `ShowNumberContactsDeletedByUserFetchXml` uses <xref:Microsoft.Xrm.Sdk.Query.FetchExpression> with a query composed using FetchXml.

powerapps-docs/developer/data-platform/best-practices/business-logic/implement-all-types-of-queries-when-filtering-preoperation-retrievemultiple.md

@@ -78,7 +78,7 @@ Unified Interface replaced the legacy web client for model-driven apps. Unified
 [Sample: Modify query in PreOperation stage](../../org-service/samples/modify-query-preoperation-stage.md)<br />
 [Query data using the SDK for .NET](../../org-service/entity-operations-query-data.md)<br />
 [Query data using FetchXml](../../fetchxml/overview.md)<br />
-[Build queries with QueryExpression](../../org-service/build-queries-with-queryexpression.md)<br />
+[Build queries with QueryExpression](../../org-service/queryexpression/overview.md)<br />
 [Limit the registration of plug-ins for Retrieve and RetrieveMultiple messages](limit-registration-plugins-retrieve-retrievemultiple.md)<br />
 [Unified Interface Community](https://community.dynamics.com/forums/thread/?discussionforumid=bc304ecc-c131-4b63-92dd-7464bba3ce3b)
 

powerapps-docs/developer/data-platform/best-practices/work-with-data/retrieve-specific-columns-entity-via-query-apis.md

@@ -144,8 +144,8 @@ Queries submitted to retrieve data from Dynamics 365 should not select all colum
 ### See also
 
 <xref href="Microsoft.Xrm.Sdk.Query.ColumnSet?text=ColumnSet Class" /><br />
-[Use of the ColumnSet Class](../../org-service/use-the-columnset-class.md)<br />
-[Build queries with QueryExpression](../../org-service/build-queries-with-queryexpression.md)<br />
+[Select columns using QueryExpression](../../org-service/queryexpression/select-columns.md)<br />
+[Query data using QueryExpression](../../org-service/queryexpression/overview.md)<br />
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/bypass-custom-business-logic-preview.md

@@ -287,7 +287,7 @@ Use this FetchXml query to return `step.sdkmessageprocessingstepid` values you c
 
 ### Limit to the number of steps
 
-To ensure that the parameter size isn't too large, the default limit on the number of steps you can pass is three. The limit is controlled using data in the [Organization table OrgDbOrgSettings column](reference/entities/organization.md#BKMK_OrgDbOrgSettings). Don't try to edit this value yourself. Use the [OrgDBOrgSettings tool for Microsoft Dynamics CRM](https://support.microsoft.com/topic/orgdborgsettings-tool-for-microsoft-dynamics-crm-20a10f46-2a24-a156-7144-365d49b842ba) or [OrgDbOrgSettings app](https://github.com/seanmcne/OrgDbOrgSettings?tab=readme-ov-file#where-to-find-the-releases) to change the `BypassBusinessLogicExecutionStepIdsLimit` value.
+To ensure that the parameter size isn't too large, the default limit on the number of steps you can pass is three. The limit is controlled using data in the [Organization table OrgDbOrgSettings column](reference/entities/organization.md#BKMK_OrgDbOrgSettings). Use the [OrgDBOrgSettings tool for Microsoft Dynamics CRM](https://support.microsoft.com/topic/orgdborgsettings-tool-for-microsoft-dynamics-crm-20a10f46-2a24-a156-7144-365d49b842ba) or [OrgDbOrgSettings app](https://github.com/seanmcne/OrgDbOrgSettings?tab=readme-ov-file#where-to-find-the-releases) to change the `BypassBusinessLogicExecutionStepIdsLimit` value.
 
 The maximum recommended size for this limit is 10 steps.
 

powerapps-docs/developer/data-platform/custom-api-tables.md

@@ -81,7 +81,7 @@ GET [Organization URI]/api/data/v9.1/customapis?$select=
 
 # [QueryExpression](#tab/queryexpression)
 
-More information: [Build queries with QueryExpression](org-service/build-queries-with-queryexpression.md)
+More information: [Build queries with QueryExpression](org-service/queryexpression/overview.md)
 
 ```csharp
 string conn = $@"