Skip to content

Commit 74b6c51

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into newNetwork
2 parents a903bd5 + 6edb204 commit 74b6c51

25 files changed

+264
-134
lines changed

articles/api-management/send-one-way-request-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ This example uses the `send-one-way-request` policy to send a message to a Slack
8989

9090
## Related policies
9191

92-
* [Intergration and external communication](api-management-policies.md#integration-and-external-communication)
92+
* [Integration and external communication](api-management-policies.md#integration-and-external-communication)
9393

9494
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]

articles/app-service/index.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
ms.topic: landing-page
1010
ms.author: msangapu
1111
ms.service: azure-app-service
12-
ms.date: 01/22/2025
12+
ms.date: 06/10/2025
1313
ms.custom: UpdateFrequency3
1414

1515
landingContent:
@@ -74,12 +74,20 @@ landingContent:
7474
- text: Invoke OpenAPI web app from Azure AI Agent
7575
url: invoke-openapi-web-app-from-azure-ai-agent-service.md
7676

77-
- title: Troubleshoot with Azure SRE Agent (AI)
77+
- title: Secure and deploy
7878
linkLists:
79+
- linkListType: concept
80+
links:
81+
- text: Security in Azure App Service
82+
url: overview-security.md
7983
- linkListType: tutorial
8084
links:
81-
- text: Fix application issues with SRE Agent
82-
url: tutorial-sre-agent.md
85+
- text: Secure with custom domain and certificate
86+
url: tutorial-secure-domain-certificate.md
87+
- text: Continuous deployment
88+
url: deploy-continuous-deployment.md
89+
- text: Upload content with FTP
90+
url: deploy-ftp.md
8391

8492
- title: Build a CRUD app
8593
linkLists:
@@ -102,18 +110,9 @@ landingContent:
102110
- text: REST API
103111
url: /rest/api/appservice/
104112

105-
- title: Secure and deploy
113+
- title: Troubleshoot with Azure SRE Agent (AI)
106114
linkLists:
107-
- linkListType: concept
108-
links:
109-
- text: Security in Azure App Service
110-
url: overview-security.md
111115
- linkListType: tutorial
112116
links:
113-
- text: Secure with custom domain and certificate
114-
url: tutorial-secure-domain-certificate.md
115-
- text: Continuous deployment
116-
url: deploy-continuous-deployment.md
117-
- text: Upload content with FTP
118-
url: deploy-ftp.md
119-
117+
- text: Fix application issues with SRE Agent
118+
url: tutorial-sre-agent.md

articles/automation/automation-child-runbooks.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,18 @@ The parameters of a child runbook called inline can be of any data type, includi
4242
Currently, PowerShell 5.1 is supported and only certain runbook types can call each other:
4343

4444
* A [PowerShell runbook](automation-runbook-types.md#powershell-runbooks) and a [graphical runbook](automation-runbook-types.md#graphical-runbooks) can call each other inline, because both are PowerShell based.
45-
* A [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks) and a graphical PowerShell Workflow runbook can call each other inline, because both are PowerShell Workflow based.
45+
* A [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks) can call another PowerShell Workflow runbook inline.
4646
* The PowerShell types and the PowerShell Workflow types can't call each other inline. They must use `Start-AzAutomationRunbook`.
4747

4848
> [!IMPORTANT]
49-
> Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2
49+
> * Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2
5050
**Workaround**: Use `Start-AutomationRunbook` ([internal cmdlet](/azure/automation/shared-resources/modules#internal-cmdlets)) or `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) to start another runbook from parent runbook.
51+
> * Executing child scripts using Graphical PowerShell Workflow runbooks is not supported.
52+
**Workaround**: Use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
5153

52-
The publish order of runbooks matters only for PowerShell Workflow and graphical PowerShell Workflow runbooks.
54+
The publish order of runbooks matters only for PowerShell Workflow runbooks.
5355

54-
When your runbook calls a graphical or PowerShell Workflow child runbook by using inline execution, it uses the name of the runbook. The name must start with `.\\` to specify that the script is in the local directory.
56+
When your runbook calls a PowerShell Workflow child runbook by using inline execution, it uses the name of the runbook. The name must start with `.\\` to specify that the script is in the local directory.
5557

5658
### Example
5759

articles/automation/troubleshoot/runbooks.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,41 @@ ms.custom: has-adal-ref, devx-track-azurepowershell
1111

1212
This article describes runbook issues that might occur and how to resolve them. For general information, see [Runbook execution in Azure Automation](../automation-runbook-execution.md).
1313

14+
## Graphical PowerShell Workflow runbooks with child runbooks fail to execute
15+
16+
### Issue
17+
Graphical PowerShell Workflow runbooks with child runbooks fail to execute as expected.
18+
19+
### Cause
20+
To improve the security posture of Graphical PowerShell Workflow runbooks, the service no longer executes Graphical PowerShell Workflow runbooks with child scripts.
21+
22+
### Resolution
23+
24+
Workaround is to use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook to start child runbook. For example, use the InlineScript block:
25+
26+
```
27+
28+
$job = Start-AzAutomationRunbook `
29+
30+
-AutomationAccountName "MyAccount" `
31+
32+
-ResourceGroupName "MyRG" `
33+
34+
-Name "ReusableTaskRunbook" `
35+
36+
-Parameters @{ TaskId = '1234' }
37+
38+
39+
40+
#Optional: Wait for job completion
41+
42+
do {
43+
44+
Start-Sleep -Seconds 5
45+
46+
$jobStatus = Get-AzAutomationJob -Id $job.Id -AutomationAccountName "MyAccount" -ResourceGroupName "MyRG"} while ($jobStatus.Status -ne "Completed")
47+
48+
```
1449

1550
## It is no longer possible to use cmdlets from imported non-default modules in graphical PowerShell runbooks
1651

articles/azure-functions/flex-consumption-plan.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ Keep these other considerations in mind when using Flex Consumption plan:
147147
+ **Triggers**: While all triggers are fully supported in a Flex Consumption plan, the Blob storage trigger only supports the [Event Grid source](./functions-event-grid-blob-trigger.md). Non-C# function apps must use version `[4.0.0, 5.0.0)` of the [extension bundle](./extension-bundles.md), or a later version.
148148
+ **Regions**: Not all regions are currently supported. To learn more, see [View currently supported regions](flex-consumption-how-to.md#view-currently-supported-regions).
149149
+ **Deployments**: Deployment slots aren't currently supported.
150+
+ **Proxies**: Functions Proxies aren't supported. Consider integrating your function apps with Azure API Management.
150151
+ **Scale**: The lowest maximum scale is currently `40`. The highest currently supported value is `1000`.
151152
+ **Managed dependencies**: [Managed dependencies in PowerShell](functions-reference-powershell.md#managed-dependencies-feature) aren't supported by Flex Consumption. You must instead [upload modules with app content](functions-reference-powershell.md#including-modules-in-app-content).
152153
+ **Diagnostic settings**: Diagnostic settings aren't currently supported.

articles/azure-functions/functions-app-settings.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,14 @@ A comma-delimited list of beta features to enable. Beta features enabled by thes
203203
|---|------------|
204204
|AzureWebJobsFeatureFlags|`feature1,feature2,EnableProxies`|
205205

206-
Add `EnableProxies` to this list to re-enable proxies on version 4.x of the Functions runtime while you plan your migration to Azure API Management. For more information, see [Re-enable proxies in Functions v4.x](./legacy-proxies.md#re-enable-proxies-in-functions-v4x).
206+
If your app currently has this setting, add new flags to the end of the comma-delineated list.
207+
208+
Currently-supported feature flags:
209+
210+
|Flag value | Description |
211+
| ----- | ----- |
212+
| `EnableProxies` | Re-enables proxies on version 4.x of the Functions runtime while you plan your migration to Azure API Management. For more information, see [Re-enable proxies in Functions v4.x](./legacy-proxies.md#re-enable-proxies-in-functions-v4x). |
213+
| `EnableAzureMonitorTimeIsoFormat` | Enables the `ISO 8601` time format in Azure Monitor logs for Linux apps running on a Dedicated (App Service) plan. |
207214

208215
## AzureWebJobsKubernetesSecretName
209216

articles/communication-services/quickstarts/tpe/teams-phone-extensibility-quickstart.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,6 @@ You need to assign a public switched telephone network (PSTN) number to your Res
148148
149149
1. Also, if you plan to make outbound PSTN calls using your Resource Accounts assigned phone number, now is a good time to assign a [Microsoft Teams Calling Plan](/microsoftteams/calling-plans-for-office-365).
150150
151-
### CCaaS Developer: Configure Call Automation to use preproduction environment
152-
153-
Use the following code snippet in C# to set use of preproduction environment for Teams Phone extensibility. The Next-PMA preprod environment has the latest code base and bug fixes.
154-
155-
```csharp
156-
CallAutomationClient callAutomationClient = new CallAutomationClient(new Uri("https://nextpma.plat.skype.com:6448"), acsConnectionString);
157-
```
158151
159152
### CCaaS Developer: Get Resource Account Information
160153

articles/communication-services/samples/includes/call-automation-azure-openai-csharp.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ This server-side application helps create a virtual assistant that can handle ph
2525
- Azure Dev Tunnels. For details, see [Enable dev tunnel](/azure/developer/dev-tunnels/get-started)
2626
- An Azure OpenAI Resource and Deployed Model. See [instructions](/azure/ai-services/openai/how-to/create-resource?pivots=web-portal).
2727

28+
> [!NOTE]
29+
> Bidirectional Streaming in Azure Communication Services is generally available, but the Azure OpenAI real-time API has its own release schedule. For up-to-date info on the API’s availability, check out the [official docs](/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#audio-models).
30+
2831
## Set up instructions
2932

3033
Before running this sample, you need to set up the resources with the following configuration updates:

articles/communication-services/samples/includes/call-automation-azure-openai-js.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ This server-side application helps create a virtual assistant that can handle ph
2727
- Azure Dev Tunnels. For details, see [Enable dev tunnel](/azure/developer/dev-tunnels/get-started)
2828
- An Azure OpenAI Resource and Deployed Model. See [instructions](/azure/ai-services/openai/how-to/create-resource?pivots=web-portal).
2929

30+
> [!NOTE]
31+
> Bidirectional Streaming in Azure Communication Services is generally available, but the Azure OpenAI real-time API has its own release schedule. For up-to-date info on the API’s availability, check out the [official docs](/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#audio-models).
32+
3033

3134
## Before running the sample for the first time
3235

articles/confidential-computing/create-confidential-vm-from-compute-gallery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The resulting image version can be used only to create confidential VMs.
3030
This image version can be replicated within the source region **but cannot be replicated to a different region** or across subscriptions currently.
3131

3232
> [!NOTE]
33-
> If you want to create an image from a Windows confidential VM that has confidential compute disk encryption enabled with a platform-managed key or a customer-managed key, you can only create a specialized image. This limitation exists because the generalization tool (**sysprep**), might not be able to generalized the encrypted image source. This limitation applies to the OS disk, which is implicitly created along with the Windows confidential VM, and the snapshot created from this OS disk.
33+
> If you want to create an image from a Windows confidential VM that has confidential compute disk encryption enabled with a platform-managed key or a customer-managed key, you can create a specialized or generalized image.
3434
3535
### Create a Confidential VM type image using Confidential VM capture
3636

0 commit comments

Comments
 (0)