Skip to content

Commit 29a85c2

Browse files
drewbatgitCopilot
andcommitted
Merge main and resolve conflicts
- Accept main's Camera TOC additions - Accept main's Tutorials indentation fix - Accept main's Modernize restructure, keep App notifications entries - Accept main's deletion of modernize-wpf-tutorial-4.md - Accept main's desktop-to-uwp-enhance.md updates Co-authored-by: Copilot <[email protected]>
2 parents 5158d49 + b259888 commit 29a85c2

253 files changed

Lines changed: 17999 additions & 7823 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: 176 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "uwp/audio-video-camera/camera-ui-features-for-mobile-devices.md",
5+
"redirect_url": "/previous-versions/windows/uwp/audio-video-camera/camera-ui-features-for-mobile-devices",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "uwp/debug-test-perf/device-portal-mobile.md",
10+
"redirect_url": "/previous-versions/windows/uwp/debug-test-perf/device-portal-mobile",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "uwp/debug-test-perf/test-with-the-emulator.md",
15+
"redirect_url": "/previous-versions/windows/uwp/debug-test-perf/test-with-the-emulator",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "uwp/threading-async/asynchronous-programming-in-cpp-universal-windows-platform-apps.md",
20+
"redirect_url": "/previous-versions/windows/uwp/threading-async/asynchronous-programming-in-cpp-universal-windows-platform-apps",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "uwp/files/quickstart-accessing-homegroup-content.md",
25+
"redirect_url": "/previous-versions/windows/uwp/files/quickstart-accessing-homegroup-content",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "uwp/files/access-the-sd-card.md",
30+
"redirect_url": "/previous-versions/windows/uwp/files/access-the-sd-card",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path": "hub/apps/develop/windows-integration/settings-mcp.md",
535
"redirect_url": "/windows/apps/develop/windows-integration/",
@@ -1470,11 +1500,6 @@
14701500
"redirect_url": "/windows/uwp/design/accessibility/accessibility-overview",
14711501
"redirect_document_id": false
14721502
},
1473-
{
1474-
"source_path": "hub/apps/design/accessibility/accessibility.md",
1475-
"redirect_url": "/windows/uwp/design/accessibility/accessibility-overview",
1476-
"redirect_document_id": false
1477-
},
14781503
{
14791504
"source_path": "uwp/accessibility/accessible-text-requirements.md",
14801505
"redirect_url": "/windows/uwp/design/accessibility/accessible-text-requirements",
@@ -5677,7 +5702,7 @@
56775702
},
56785703
{
56795704
"source_path": "uwp/porting/desktop-to-uwp-distribute.md",
5680-
"redirect_url": "/windows/apps/desktop/modernize/desktop-to-uwp-distribute",
5705+
"redirect_url": "/windows/msix/desktop/source-code-overview",
56815706
"redirect_document_id": false
56825707
},
56835708
{
@@ -5687,7 +5712,7 @@
56875712
},
56885713
{
56895714
"source_path": "uwp/porting/desktop-to-uwp-extend.md",
5690-
"redirect_url": "/windows/apps/desktop/modernize/desktop-to-uwp-extend",
5715+
"redirect_url": "/windows/apps/windows-app-sdk/",
56915716
"redirect_document_id": false
56925717
},
56935718
{
@@ -11150,17 +11175,17 @@
1115011175
},
1115111176
{
1115211177
"source_path": "hub/apps/how-tos/chatgpt-openai-winui3.md",
11153-
"redirect_url": "/windows/apps/how-tos/github-copilot-winui-vs",
11178+
"redirect_url": "/windows/apps/how-tos/ai-build",
1115411179
"redirect_document_id": false
1115511180
},
1115611181
{
1115711182
"source_path": "hub/apps/how-tos/copilot-chat-winui3.md",
11158-
"redirect_url": "/windows/apps/how-tos/github-copilot-winui-vs",
11183+
"redirect_url": "/windows/apps/how-tos/ai-build",
1115911184
"redirect_document_id": false
1116011185
},
1116111186
{
1116211187
"source_path": "hub/apps/how-tos/dall-e-winui3.md",
11163-
"redirect_url": "/windows/apps/how-tos/github-copilot-winui-vs",
11188+
"redirect_url": "/windows/apps/how-tos/ai-build",
1116411189
"redirect_document_id": false
1116511190
},
1116611191
{
@@ -11477,6 +11502,146 @@
1147711502
"source_path": "hub/apps/desktop/visual-studio-templates.md",
1147811503
"redirect_url": "/windows/apps/dev-tools/visual-studio",
1147911504
"redirect_document_id": false
11505+
},
11506+
{
11507+
"source_path": "hub/apps/design/accessibility/accessibility.md",
11508+
"redirect_url": "/windows/apps/design/accessibility/accessibility-overview",
11509+
"redirect_document_id": false
11510+
},
11511+
{
11512+
"source_path": "hub/apps/design/accessibility/practices-to-avoid.md",
11513+
"redirect_url": "/windows/apps/design/accessibility/accessibility-overview#practices-to-avoid",
11514+
"redirect_document_id": false
11515+
},
11516+
{
11517+
"source_path": "hub/apps/design/accessibility/developing-inclusive-windows-apps.md",
11518+
"redirect_url": "/windows/apps/develop/accessibility",
11519+
"redirect_document_id": false
11520+
},
11521+
{
11522+
"source_path": "hub/apps/package-and-deploy/choose-packaging-model.md",
11523+
"redirect_url": "/windows/apps/package-and-deploy/packaging/",
11524+
"redirect_document_id": false
11525+
},
11526+
{
11527+
"source_path": "hub/apps/design/globalizing/use-patterns-to-format-dates-and-times.md",
11528+
"redirect_url": "/windows/apps/design/globalizing/use-global-ready-formats#use-templates-and-patterns-for-advanced-datetime-formatting",
11529+
"redirect_document_id": false
11530+
},
11531+
{
11532+
"source_path": "hub/apps/winui/winui3/localize-winui3-app.md",
11533+
"redirect_url": "/windows/apps/windows-app-sdk/mrtcore/localize-strings#localize-a-winui-3-packaged-app",
11534+
"redirect_document_id": false
11535+
},
11536+
{
11537+
"source_path": "hub/apps/design/globalizing/guidelines-and-checklist-for-globalizing-your-app.md",
11538+
"redirect_url": "/windows/apps/design/globalizing/globalizing-portal#guidelines-for-globalization",
11539+
"redirect_document_id": false
11540+
},
11541+
{
11542+
"source_path": "uwp/files/quickstart-listing-files-and-folders.md",
11543+
"redirect_url": "/windows/apps/develop/files/list-files-folders",
11544+
"redirect_document_id": false
11545+
},
11546+
{
11547+
"source_path": "uwp/files/quickstart-reading-and-writing-files.md",
11548+
"redirect_url": "/windows/apps/develop/files/create-read-write-files",
11549+
"redirect_document_id": false
11550+
},
11551+
{
11552+
"source_path": "uwp/files/best-practices-for-writing-to-files.md",
11553+
"redirect_url": "/windows/apps/develop/files/best-practices-writing-files",
11554+
"redirect_document_id": false
11555+
},
11556+
{
11557+
"source_path": "uwp/files/quickstart-getting-file-properties.md",
11558+
"redirect_url": "/windows/apps/develop/files/file-properties",
11559+
"redirect_document_id": false
11560+
},
11561+
{
11562+
"source_path": "uwp/files/quickstart-determining-availability-of-microsoft-onedrive-files.md",
11563+
"redirect_url": "/windows/apps/develop/files/determine-availability-microsoft-onedrive-files",
11564+
"redirect_document_id": false
11565+
},
11566+
{
11567+
"source_path": "uwp/files/quickstart-managing-folders-in-the-music-pictures-and-videos-libraries.md",
11568+
"redirect_url": "/windows/apps/develop/files/music-pictures-videos-libraries",
11569+
"redirect_document_id": false
11570+
},
11571+
{
11572+
"source_path": "uwp/files/thumbnails.md",
11573+
"redirect_url": "/windows/apps/develop/files/thumbnails",
11574+
"redirect_document_id": false
11575+
},
11576+
{
11577+
"source_path": "uwp/files/how-to-track-recently-used-files-and-folders.md",
11578+
"redirect_url": "/windows/apps/develop/files/track-recently-used-files-folders",
11579+
"redirect_document_id": false
11580+
},
11581+
{
11582+
"source_path": "uwp/files/change-tracking-filesystem.md",
11583+
"redirect_url": "/windows/apps/develop/files/change-tracking-filesystem",
11584+
"redirect_document_id": false
11585+
},
11586+
{
11587+
"source_path": "uwp/files/file-access-permissions.md",
11588+
"redirect_url": "/windows/apps/develop/files/file-access-permissions",
11589+
"redirect_document_id": false
11590+
},
11591+
{
11592+
"source_path": "uwp/files/fast-file-properties.md",
11593+
"redirect_url": "/windows/apps/develop/files/fast-file-properties",
11594+
"redirect_document_id": false
11595+
},
11596+
{
11597+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial.md",
11598+
"redirect_url": "/windows/apps/desktop/modernize/",
11599+
"redirect_document_id": false
11600+
},
11601+
{
11602+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial-1.md",
11603+
"redirect_url": "/windows/apps/desktop/modernize/",
11604+
"redirect_document_id": false
11605+
},
11606+
{
11607+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial-2.md",
11608+
"redirect_url": "/windows/apps/desktop/modernize/",
11609+
"redirect_document_id": false
11610+
},
11611+
{
11612+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial-3.md",
11613+
"redirect_url": "/windows/apps/desktop/modernize/",
11614+
"redirect_document_id": false
11615+
},
11616+
{
11617+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial-4.md",
11618+
"redirect_url": "/windows/apps/desktop/modernize/",
11619+
"redirect_document_id": false
11620+
},
11621+
{
11622+
"source_path": "hub/apps/desktop/modernize/modernize-wpf-tutorial-5.md",
11623+
"redirect_url": "/windows/apps/desktop/modernize/",
11624+
"redirect_document_id": false
11625+
},
11626+
{
11627+
"source_path": "hub/apps/develop/background-processing/index.md",
11628+
"redirect_url": "/windows/apps/develop/app-lifecycle-and-system-services",
11629+
"redirect_document_id": false
11630+
},
11631+
{
11632+
"source_path": "hub/apps/windows-app-sdk/applifecycle/app-background-task.md",
11633+
"redirect_url": "/windows/apps/windows-app-sdk/applifecycle/background-tasks",
11634+
"redirect_document_id": false
11635+
},
11636+
{
11637+
"source_path": "hub/apps/desktop/modernize/desktop-to-uwp-distribute.md",
11638+
"redirect_url": "/windows/msix/desktop/source-code-overview",
11639+
"redirect_document_id": false
11640+
},
11641+
{
11642+
"source_path": "hub/apps/desktop/modernize/desktop-to-uwp-extend.md",
11643+
"redirect_url": "/windows/apps/windows-app-sdk/",
11644+
"redirect_document_id": false
1148011645
}
1148111646
]
11482-
}
11647+
}

0 commit comments

Comments
 (0)