Skip to content

Commit 57c6e38

Browse files
authored
Merge pull request #4301 from MicrosoftDocs/master637091139036193971
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 71a1c9c + eb5cd43 commit 57c6e38

6 files changed

+7
-224
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,11 @@
18101810
"redirect_url": "https://visualstudio.microsoft.com/vs/older-downloads/isolated-shell/",
18111811
"redirect_document_id": false
18121812
},
1813+
{
1814+
"source_path": "docs/extensibility/xaml-designer-extensibility-migration.md",
1815+
"redirect_url": "https://github.com/microsoft/xaml-designer-extensibility/blob/master/documents/xaml-designer-extensibility-migration.md",
1816+
"redirect_document_id": true
1817+
},
18131818
{
18141819
"source_path": "docs/get-started/csharp/tutorial-projects-solutions.md",
18151820
"redirect_url": "/visualstudio/get-started/tutorial-projects-solutions",

docs/code-quality/how-to-specify-additional-code-information-by-using-analysis-assume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void test()
4646
{
4747
char pc = (char)malloc(5);
4848
FreeAndNull(&pc);
49-
__analysis_assume(pc == NULL);
49+
_Analysis_assume(pc == NULL);
5050
f(pc);
5151
}
5252
```
Binary file not shown.

docs/extensibility/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@
213213
href: how-to-open-standard-editors.md
214214
- name: Open Editors for Open Documents
215215
href: how-to-open-editors-for-open-documents.md
216-
- name: XAML Designer Extensibility Migration Guide
217-
href: xaml-designer-extensibility-migration.md
218216
- name: Extend Projects
219217
# Auto-expanded node
220218
items:

docs/extensibility/xaml-designer-extensibility-migration.md

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

docs/xaml-tools/creating-a-ui-by-using-xaml-designer-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ manager: jillfra
1717

1818
The XAML Designer in Visual Studio and Blend for Visual Studio provides a visual interface to help you design XAML-based apps, such as WPF, UWP, and Xamarin.Forms apps. You can create user interfaces for your apps by dragging controls from the Toolbox window (Assets window in Blend for Visual Studio) and setting properties in the Properties window. You can also edit XAML directly in XAML view.
1919

20-
For advanced users, you can even [customize the XAML Designer](../extensibility/xaml-designer-extensibility-migration.md).
20+
For advanced users, you can even [customize the XAML Designer](https://github.com/microsoft/xaml-designer-extensibility/blob/master/documents/xaml-designer-extensibility-migration.md).
2121

2222
## XAML Designer workspace
2323

0 commit comments

Comments
 (0)