Skip to content

Commit 4e66a59

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fxl---remove-old-aspnet-tutorials-2
2 parents 04114f9 + 546f8f8 commit 4e66a59

File tree

576 files changed

+3354
-2391
lines changed

Some content is hidden

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

576 files changed

+3354
-2391
lines changed

.gitignore

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,115 @@ articles/planetary-computer/image_syntax_checker.py
4646
articles/planetary-computer/image-file-fixer.py
4747
articles/planetary-computer/orphaned-media.py
4848
articles/planetary-computer/orphaned_media_files.txt
49+
articles/planetary-computer/naip-airports.md
50+
articles/planetary-computer/sentinel-2-l2a-grindavik.md
51+
articles/planetary-computer/temp_editor.md
52+
articles/planetary-computer/umbra-sar.md
53+
articles/planetary-computer/geocatalog_configs/buildingfootprint/mosaics.json
54+
articles/planetary-computer/geocatalog_configs/buildingfootprint/render-options.json
55+
articles/planetary-computer/geocatalog_configs/buildingfootprint/stac.json
56+
articles/planetary-computer/geocatalog_configs/buildingfootprint/tile-settings.json
57+
articles/planetary-computer/geocatalog_configs/ecmwf-forecast/mosaics.json
58+
articles/planetary-computer/geocatalog_configs/ecmwf-forecast/render-options.json
59+
articles/planetary-computer/geocatalog_configs/ecmwf-forecast/stac.json
60+
articles/planetary-computer/geocatalog_configs/ecmwf-forecast/tile-settings.json
61+
articles/planetary-computer/geocatalog_configs/esa-cci-lc/mosaics.json
62+
articles/planetary-computer/geocatalog_configs/esa-cci-lc/render-options.json
63+
articles/planetary-computer/geocatalog_configs/esa-cci-lc/stac.json
64+
articles/planetary-computer/geocatalog_configs/esa-cci-lc/tile-settings.json
65+
articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/mosaics.json
66+
articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/render-options.json
67+
articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/stac.json
68+
articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/tile-settings.json
69+
articles/planetary-computer/geocatalog_configs/fws-nwi/mosaics.json
70+
articles/planetary-computer/geocatalog_configs/fws-nwi/stac.json
71+
articles/planetary-computer/geocatalog_configs/fws-nwi/tile-settings.json
72+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/mosaics.json
73+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/stac.json
74+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/tile-settings.json
75+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/mosaics.json
76+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/stac.json
77+
articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/tile-settings.json
78+
articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/mosaics.json
79+
articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/render-options.json
80+
articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/stac.json
81+
articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/tile-settings.json
82+
articles/planetary-computer/geocatalog_configs/goes-glm/mosaics.json
83+
articles/planetary-computer/geocatalog_configs/goes-glm/stac.json
84+
articles/planetary-computer/geocatalog_configs/goes-glm/tile-settings.json
85+
articles/planetary-computer/geocatalog_configs/guam-dem/mosaics.json
86+
articles/planetary-computer/geocatalog_configs/guam-dem/render-options.json
87+
articles/planetary-computer/geocatalog_configs/guam-dem/stac.json
88+
articles/planetary-computer/geocatalog_configs/guam-dem/tile-settings.json
89+
articles/planetary-computer/geocatalog_configs/LA-Fires/mosaics.json
90+
articles/planetary-computer/geocatalog_configs/LA-Fires/render-options.json
91+
articles/planetary-computer/geocatalog_configs/LA-Fires/stac.json
92+
articles/planetary-computer/geocatalog_configs/LA-Fires/tile-settings.json
93+
articles/planetary-computer/geocatalog_configs/meta-population/render-options.json
94+
articles/planetary-computer/geocatalog_configs/meta-population/stac.json
95+
articles/planetary-computer/geocatalog_configs/meta-population/tile-settings.json
96+
articles/planetary-computer/geocatalog_configs/modis-14A1-061/mosaics.json
97+
articles/planetary-computer/geocatalog_configs/modis-14A1-061/stac.json
98+
articles/planetary-computer/geocatalog_configs/modis-14A1-061/tile-settings.json
99+
articles/planetary-computer/geocatalog_configs/modis-21A2-061/mosaics.json
100+
articles/planetary-computer/geocatalog_configs/modis-21A2-061/stac.json
101+
articles/planetary-computer/geocatalog_configs/modis-21A2-061/tile-settings.json
102+
articles/planetary-computer/geocatalog_configs/monrovia-drone/mosaics.json
103+
articles/planetary-computer/geocatalog_configs/monrovia-drone/render-options.json
104+
articles/planetary-computer/geocatalog_configs/monrovia-drone/stac.json
105+
articles/planetary-computer/geocatalog_configs/monrovia-drone/tile-settings.json
106+
articles/planetary-computer/geocatalog_configs/naip-airports/mosaics.json
107+
articles/planetary-computer/geocatalog_configs/naip-airports/render-options.json
108+
articles/planetary-computer/geocatalog_configs/naip-airports/stac.json
109+
articles/planetary-computer/geocatalog_configs/naip-airports/tile-settings.json
110+
articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/mosaics.json
111+
articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/render-options.json
112+
articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/stac.json
113+
articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/tile-settings.json
114+
articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/mosaics.json
115+
articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/render-options.json
116+
articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/stac.json
117+
articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/tile-settings.json
118+
articles/planetary-computer/geocatalog_configs/ndvi_diff/mosaics.json
119+
articles/planetary-computer/geocatalog_configs/ndvi_diff/render-options.json
120+
articles/planetary-computer/geocatalog_configs/ndvi_diff/stac.json
121+
articles/planetary-computer/geocatalog_configs/ndvi_diff/tile-settings.json
122+
articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/mosaics.json
123+
articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/render-options.json
124+
articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/stac.json
125+
articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/tile-settings.json
126+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/mosaics.json
127+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/stac.json
128+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/tile-settings.json
129+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/mosaics.json
130+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/stac.json
131+
articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/tile-settings.json
132+
articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/render-options.json
133+
articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/stac.json
134+
articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/tile-settings.json
135+
articles/planetary-computer/geocatalog_configs/potsdam-aerial/mosaics.json
136+
articles/planetary-computer/geocatalog_configs/potsdam-aerial/render-options.json
137+
articles/planetary-computer/geocatalog_configs/potsdam-aerial/stac.json
138+
articles/planetary-computer/geocatalog_configs/potsdam-aerial/tile-settings.json
139+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/mosaics.json
140+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/render-options.json
141+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/stac.json
142+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/tile-settings.json
143+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/mosaics.json
144+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/render-options.json
145+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/stac.json
146+
articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/tile-settings.json
147+
articles/planetary-computer/geocatalog_configs/umbra-sar/mosaics.json
148+
articles/planetary-computer/geocatalog_configs/umbra-sar/render-options.json
149+
articles/planetary-computer/geocatalog_configs/umbra-sar/stac.json
150+
articles/planetary-computer/geocatalog_configs/umbra-sar/tile-settings.json
151+
articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/mosaics.json
152+
articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/render-options.json
153+
articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/stac.json
154+
articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/tile-settings.json
155+
articles/planetary-computer/geocatalog_configs/umbra-sar-ships/mosaics.json
156+
articles/planetary-computer/geocatalog_configs/umbra-sar-ships/render-options.json
157+
articles/planetary-computer/geocatalog_configs/umbra-sar-ships/stac.json
158+
articles/planetary-computer/geocatalog_configs/umbra-sar-ships/tile-settings.json
159+
articles/planetary-computer/helper-content/collection-config-scraper.py
160+
articles/planetary-computer/helper-content/generate_collection_docs.py

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,6 +2434,16 @@
24342434
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
24352435
"redirect_document_id": false
24362436
},
2437+
{
2438+
"source_path_from_root": "/articles/vpn-gateway/gateway-sku-change.md",
2439+
"redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
2440+
"redirect_document_id": false
2441+
},
2442+
{
2443+
"source_path_from_root": "/articles/vpn-gateway/gateway-sku-resize.md",
2444+
"redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
2445+
"redirect_document_id": false
2446+
},
24372447
{
24382448
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
24392449
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -7084,6 +7094,26 @@
70847094
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
70857095
"redirect_document_id": false
70867096
},
7097+
{
7098+
"source_path": "articles/app-service/sre-agent-overview.md",
7099+
"redirect_url": "/azure/sre-agent/overview",
7100+
"redirect_document_id": false
7101+
},
7102+
{
7103+
"source_path": "articles/app-service/sre-agent-usage.md",
7104+
"redirect_url": "/azure/sre-agent/usage",
7105+
"redirect_document_id": false
7106+
},
7107+
{
7108+
"source_path": "articles/app-service/tutorial-sre-agent.md",
7109+
"redirect_url": "/azure/sre-agent/troubleshoot-azure-app-service",
7110+
"redirect_document_id": false
7111+
},
7112+
{
7113+
"source_path": "articles/container-apps/sre-agent-troubleshoot.md",
7114+
"redirect_url": "/azure/sre-agent/troubleshoot-azure-container-apps",
7115+
"redirect_document_id": false
7116+
},
70877117
{
70887118
"source_path": "articles/reliability/whats-new.md",
70897119
"redirect_url": "/azure/reliability/overview",

articles/api-management/export-rest-mcp-server.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ To verify that the MCP server is working, you can use Visual Studio Code to send
8585
8686
In Visual Studio Code, use GitHub Copilot chat in agent mode (preview) to add the MCP server and use the tools. For background about MCP servers in Visual Studio Code, see [Use MCP Servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers).
8787
88+
> [!TIP]
89+
> If you use the [MCP Inspector](https://modelcontextprotocol.io/docs/tools/inspector) to test an MCP server created by API Management, we recommend using version 0.9.0.
90+
8891
### Add the MCP server in Visual Studio Code
8992
9093
To add the MCP server in Visual Studio Code:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ The `send-one-way-request` policy sends the provided request to the specified UR
5757
- [**Policy scopes:**](./api-management-howto-policies.md#scopes) global, workspace, product, API, operation
5858
- [**Gateways:**](api-management-gateways-overview.md) classic, v2, consumption, self-hosted
5959

60+
### Usage notes
61+
62+
* Using multiple `send-one-way-request` policies in outbound section is not supported in self-hosted gateway.
63+
6064
## Example
6165

6266
This example uses the `send-one-way-request` policy to send a message to a Slack chat room if the HTTP response code is greater than or equal to 500. For more information on this sample, see [Using external services from the Azure API Management service](./api-management-sample-send-request.md).
@@ -91,4 +95,4 @@ This example uses the `send-one-way-request` policy to send a message to a Slack
9195

9296
* [Integration and external communication](api-management-policies.md#integration-and-external-communication)
9397

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

articles/api-management/validate-azure-ad-token-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: reference
9-
ms.date: 01/29/2025
9+
ms.date: 06/17/2025
1010
ms.author: danlep
1111
---
1212

@@ -30,6 +30,7 @@ The `validate-azure-ad-token` policy enforces the existence and validity of a JS
3030
header-name="name of HTTP header containing the token (alternatively, use query-parameter-name or token-value attribute to specify token)"
3131
query-parameter-name="name of query parameter used to pass the token (alternative, use header-name or token-value attribute to specify token)"
3232
token-value="expression returning the token as a string (alternatively, use header-name or query-parameter attribute to specify token)"
33+
authentication-endpoint="Microsoft Entra environment endpoint"
3334
failed-validation-httpcode="HTTP status code to return on failure"
3435
failed-validation-error-message="error message to return on failure"
3536
output-token-variable-name="name of a variable to receive a JWT object representing successfully validated token">
@@ -66,6 +67,7 @@ The `validate-azure-ad-token` policy enforces the existence and validity of a JS
6667
| header-name | The name of the HTTP header holding the token. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | `Authorization` |
6768
| query-parameter-name | The name of the query parameter holding the token. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | N/A |
6869
| token-value | Expression returning a string containing the token. You must not return `Bearer` as part of the token value. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | N/A |
70+
| authentication-endpoint | Microsoft Entra endpoint used to acquire tokens in environments such as national clouds. Prefix `https://` is optional. Example: `https://login.microsoftonline.us` for Microsoft Entra ID for US Government. | No | `https://login-microsoftonline.com` |
6971
| failed-validation-httpcode | HTTP status code to return if the JWT doesn't pass validation. Policy expressions are allowed. | No | 401 |
7072
| failed-validation-error-message | Error message to return in the HTTP response body if the JWT doesn't pass validation. This message must have any special characters properly escaped. Policy expressions are allowed. | No | Default error message depends on validation issue, for example "JWT not present." |
7173
| output-token-variable-name | String. Name of context variable that will receive token value as an object of type [`Jwt`](api-management-policy-expressions.md) upon successful token validation. Policy expressions aren't allowed. | No | N/A |

articles/app-service/app-service-web-app-cloning.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ Here are the known restrictions of app cloning:
119119

120120
* Autoscale settings aren't cloned.
121121
* Backup schedule settings aren't cloned.
122-
* Virtual network settings aren't cloned.
123122
* Application Insights isn't automatically set up on the destination app.
124123
* Easy Auth settings aren't cloned.
125124
* Kudu extensions aren't cloned.

0 commit comments

Comments
 (0)