Skip to content

Commit 5554231

Browse files
committed
fixed conflict
2 parents eb02a95 + b912232 commit 5554231

128 files changed

Lines changed: 182 additions & 3356 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62721,6 +62721,166 @@
6272162721
"redirect_document_id": false
6272262722
},
6272362723
{
62724+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/index.yml",
62725+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62726+
"redirect_document_id": false
62727+
},
62728+
{
62729+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/1-introduction.yml",
62730+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62731+
"redirect_document_id": false
62732+
},
62733+
{
62734+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/2-create-an-api-gateway.yml",
62735+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62736+
"redirect_document_id": false
62737+
},
62738+
{
62739+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/3-exercise-create-an-api-gateway.yml",
62740+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62741+
"redirect_document_id": false
62742+
},
62743+
{
62744+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/4-import-and-publish-an-api.yml",
62745+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62746+
"redirect_document_id": false
62747+
},
62748+
{
62749+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/5-exercise-import-and-publish-an-api.yml",
62750+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62751+
"redirect_document_id": false
62752+
},
62753+
{
62754+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/6-call-an-api-with-a-subscription-key.yml",
62755+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62756+
"redirect_document_id": false
62757+
},
62758+
{
62759+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/7-exercise-call-an-api-with-a-subscription-key.yml",
62760+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62761+
"redirect_document_id": false
62762+
},
62763+
{
62764+
"source_path": "learn-pr/azure/publish-manage-apis-with-azure-api-management/8-summary.yml",
62765+
"redirect_url": "https://learn.microsoft.com/en-us/azure/api-management/import-and-publish",
62766+
"redirect_document_id": false
62767+
},
62768+
{
62769+
"source_path": "learn-pr/azure-devops/implement-code-workflow/index.yml",
62770+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62771+
"redirect_document_id": false
62772+
},
62773+
{
62774+
"source_path": "learn-pr/azure-devops/implement-code-workflow/1-introduction.yml",
62775+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62776+
"redirect_document_id": false
62777+
},
62778+
{
62779+
"source_path": "learn-pr/azure-devops/implement-code-workflow/2-choose-a-code-flow-strategy.yml",
62780+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62781+
"redirect_document_id": false
62782+
},
62783+
{
62784+
"source_path": "learn-pr/azure-devops/implement-code-workflow/3-set-up-environment.yml",
62785+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62786+
"redirect_document_id": false
62787+
},
62788+
{
62789+
"source_path": "learn-pr/azure-devops/implement-code-workflow/4-create-pull-request.yml",
62790+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62791+
"redirect_document_id": false
62792+
},
62793+
{
62794+
"source_path": "learn-pr/azure-devops/implement-code-workflow/5-push-a-change.yml",
62795+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62796+
"redirect_document_id": false
62797+
},
62798+
{
62799+
"source_path": "learn-pr/azure-devops/implement-code-workflow/6-add-build-badge.yml",
62800+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62801+
"redirect_document_id": false
62802+
},
62803+
{
62804+
"source_path": "learn-pr/azure-devops/implement-code-workflow/7-track-build-history.yml",
62805+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62806+
"redirect_document_id": false
62807+
},
62808+
{
62809+
"source_path": "learn-pr/azure-devops/implement-code-workflow/8-require-reviewer.yml",
62810+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62811+
"redirect_document_id": false
62812+
},
62813+
{
62814+
"source_path": "learn-pr/azure-devops/implement-code-workflow/9-clean-up-environment.yml",
62815+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62816+
"redirect_document_id": false
62817+
},
62818+
{
62819+
"source_path": "learn-pr/azure-devops/implement-code-workflow/10-summary.yml",
62820+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/user-guide/code-with-git?toc=%2fazure%2fdevops%2fget-started%2ftoc.json&view=azure-devops",
62821+
"redirect_document_id": false
62822+
},
62823+
{
62824+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/index.yml",
62825+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62826+
"redirect_document_id": false
62827+
},
62828+
{
62829+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/1-introduction.yml",
62830+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62831+
"redirect_document_id": false
62832+
},
62833+
{
62834+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/2-plan-build-dependencies-for-your-pipeline.yml",
62835+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62836+
"redirect_document_id": false
62837+
},
62838+
{
62839+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/2b-what-is-azure-artifacts.yml",
62840+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62841+
"redirect_document_id": false
62842+
},
62843+
{
62844+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/3-set-up-environment.yml",
62845+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62846+
"redirect_document_id": false
62847+
},
62848+
{
62849+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/4-create-feed.yml",
62850+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62851+
"redirect_document_id": false
62852+
},
62853+
{
62854+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/5-create-package-pipeline.yml",
62855+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62856+
"redirect_document_id": false
62857+
},
62858+
{
62859+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/6-consume-package.yml",
62860+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62861+
"redirect_document_id": false
62862+
},
62863+
{
62864+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/7-push-a-change.yml",
62865+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62866+
"redirect_document_id": false
62867+
},
62868+
{
62869+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/8-clean-up-environment.yml",
62870+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62871+
"redirect_document_id": false
62872+
},
62873+
{
62874+
"source_path": "learn-pr/azure-devops/manage-build-dependencies/9-summary.yml",
62875+
"redirect_url": "https://learn.microsoft.com/en-us/azure/devops/artifacts/start-using-azure-artifacts",
62876+
"redirect_document_id": false
62877+
},
62878+
{
62879+
"source_path": "learn-pr/paths/build-applications-with-azure-devops/index.yml",
62880+
"redirect_url": "https://learn.microsoft.com/en-us/training/browse/",
62881+
"redirect_document_id": false
62882+
},
62883+
{
6272462884
"source_path": "learn-pr/paths/create-serverless-applications/index.yml",
6272562885
"redirect_url": "https://learn.microsoft.com/en-us/training/browse/",
6272662886
"redirect_document_id": false

learn-pr/achievements.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7629,4 +7629,24 @@ achievements:
76297629
type: badge
76307630
title: Introduction to Azure Web Application Firewall
76317631
summary: Describe how Azure Web Application Firewall protects Azure web applications from common attacks, including the features, how it's deployed, and common use cases.
7632-
iconUrl: /training/achievements/introduction-to-azure-web-application-firewall.svg
7632+
iconUrl: /training/achievements/introduction-to-azure-web-application-firewall.svg
7633+
- uid: learn.publish-manage-apis-with-azure-api-management.badge
7634+
type: badge
7635+
title: Publish and manage your APIs with Azure API Management
7636+
summary: Use API management to control who uses your APIs, to enforce usage policies, and to present a professional front-end to developers using the API.
7637+
iconUrl: /training/achievements/publish-manage-apis-with-azure-api-management.svg
7638+
- uid: learn.azdo.implement-code-workflow.badge
7639+
type: badge
7640+
title: Implement a code workflow in your build pipeline by using Git and GitHub
7641+
summary: Collaborate with others and merge only the highest quality code.
7642+
iconUrl: /training/achievements/azure-devops/implement-a-code-workflow-in-your-build-pipeline.svg
7643+
- uid: learn.azdo.manage-build-dependencies.badge
7644+
type: badge
7645+
title: Manage build dependencies with Azure Artifacts
7646+
summary: Manage your application and the packages it uses across build Pipelines.
7647+
iconUrl: /training/achievements/azure-devops/manage-dependencies-in-your-build-pipeline.svg
7648+
- uid: learn.azdo.build-applications-with-azure-devops.trophy
7649+
type: trophy
7650+
title: Build applications with Azure DevOps learning path
7651+
summary: Azure DevOps enables you to build, test, and deploy any application to any cloud or on premises. Learn how to configure build pipelines that continuously build, test, and verify your applications.
7652+
iconUrl: /training/achievements/azure-devops/build-applications-with-azure-devops.svg

learn-pr/azure-devops/implement-code-workflow/1-introduction.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/10-summary.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/2-choose-a-code-flow-strategy.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/3-set-up-environment.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/4-create-pull-request.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/5-push-a-change.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/6-add-build-badge.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

learn-pr/azure-devops/implement-code-workflow/7-track-build-history.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)