Skip to content

Commit 3a19494

Browse files
Merge pull request #682 from MicrosoftDocs/main
Merge to Live
2 parents b06b414 + ab8afee commit 3a19494

35 files changed

+149
-3744
lines changed

.openpublishing.redirection.json

Lines changed: 98 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,112 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "archive/graph/providers/InteractiveProviderBehavior.md",
5-
"redirect_url": "/graph/providers/interactiveproviderbehavior",
6-
"redirect_document_id": true
4+
"source_path": "docs/archive/graph/providers/InteractiveProviderBehavior.md",
5+
"redirect_url": "/graph/providers/interactiveproviderbehavior"
76
},
87
{
9-
"source_path": "archive/graph/providers/MockProviderBehavior.md",
10-
"redirect_url": "/graph/providers/mockproviderbehavior",
11-
"redirect_document_id": true
8+
"source_path": "docs/archive/graph/providers/MockProviderBehavior.md",
9+
"redirect_url": "/graph/providers/mockproviderbehavior"
1210
},
1311
{
14-
"source_path": "graph/authentication/msal.md",
15-
"redirect_url": "/graph/authentication/msalprovider",
16-
"redirect_document_id": true
12+
"source_path": "docs/graph/authentication/msal.md",
13+
"redirect_url": "/graph/authentication/msalprovider"
1714
},
1815
{
19-
"source_path": "graph/authentication/windows.md",
20-
"redirect_url": "/graph/authentication/windowsprovider",
21-
"redirect_document_id": true
16+
"source_path": "docs/graph/authentication/windows.md",
17+
"redirect_url": "/graph/authentication/windowsprovider"
2218
},
2319
{
24-
"source_path": "graph/authentication/custom.md",
25-
"redirect_url": "/graph/authentication/iprovider",
26-
"redirect_document_id": true
20+
"source_path": "docs/graph/authentication/custom.md",
21+
"redirect_url": "/graph/authentication/iprovider"
22+
},
23+
{
24+
"source_path": "docs/mvvm/Introduction.md",
25+
"redirect_url": "/dotnet/communitytoolkit/mvvm/"
26+
},
27+
{
28+
"source_path": "docs/mvvm/ObservableObject.md",
29+
"redirect_url": "/dotnet/communitytoolkit/mvvm/observableobject"
30+
},
31+
{
32+
"source_path": "docs/mvvm/ObservableRecipient.md",
33+
"redirect_url": "/dotnet/communitytoolkit/mvvm/observablerecipient"
34+
},
35+
{
36+
"source_path": "docs/mvvm/ObservableValidator.md",
37+
"redirect_url": "/dotnet/communitytoolkit/mvvm/observablevalidator"
38+
},
39+
{
40+
"source_path": "docs/mvvm/RelayCommand.md",
41+
"redirect_url": "/dotnet/communitytoolkit/mvvm/relaycommand"
42+
},
43+
{
44+
"source_path": "docs/mvvm/AsyncRelayCommand.md",
45+
"redirect_url": "/dotnet/communitytoolkit/mvvm/asyncrelaycommand"
46+
},
47+
{
48+
"source_path": "docs/mvvm/Messenger.md",
49+
"redirect_url": "/dotnet/communitytoolkit/mvvm/messenger"
50+
},
51+
{
52+
"source_path": "docs/mvvm/Ioc.md",
53+
"redirect_url": "/dotnet/communitytoolkit/mvvm/ioc"
54+
},
55+
{
56+
"source_path": "docs/mvvm/PuttingThingsTogether.md",
57+
"redirect_url": "/dotnet/communitytoolkit/mvvm/puttingthingstogether"
58+
},
59+
{
60+
"source_path": "docs/mvvm/MigratingFromMvvmLight.md",
61+
"redirect_url": "/dotnet/communitytoolkit/mvvm/migratingfrommvvmlight"
62+
},
63+
{
64+
"source_path": "docs/mvvm/MigratingFromMvvmBasic.md",
65+
"redirect_url": "/dotnet/communitytoolkit/mvvm/migratingfrommvvmbasic"
66+
},
67+
{
68+
"source_path": "docs/high-performance/Introduction.md",
69+
"redirect_url": "/dotnet/communitytoolkit/high-performance/introduction"
70+
},
71+
{
72+
"source_path": "docs/high-performance/MemoryOwner.md",
73+
"redirect_url": "/dotnet/communitytoolkit/high-performance/memoryowner"
74+
},
75+
{
76+
"source_path": "docs/high-performance/SpanOwner.md",
77+
"redirect_url": "/dotnet/communitytoolkit/high-performance/spanowner"
78+
},
79+
{
80+
"source_path": "docs/high-performance/StringPool.md",
81+
"redirect_url": "/dotnet/communitytoolkit/high-performance/stringpool"
82+
},
83+
{
84+
"source_path": "docs/high-performance/Memory2D.md",
85+
"redirect_url": "/dotnet/communitytoolkit/high-performance/memory2d"
86+
},
87+
{
88+
"source_path": "docs/high-performance/Span2D.md",
89+
"redirect_url": "/dotnet/communitytoolkit/high-performance/span2d"
90+
},
91+
{
92+
"source_path": "docs/high-performance/ParallelHelper.md",
93+
"redirect_url": "/dotnet/communitytoolkit/high-performance/parallelhelper"
94+
},
95+
{
96+
"source_path": "docs/high-performance/Ref.md",
97+
"redirect_url": "/dotnet/communitytoolkit/high-performance/ref"
98+
},
99+
{
100+
"source_path": "docs/diagnostics/Introduction.md",
101+
"redirect_url": "/dotnet/communitytoolkit/diagnostics/introduction"
102+
},
103+
{
104+
"source_path": "docs/developer-tools/Guard.md",
105+
"redirect_url": "/dotnet/communitytoolkit/diagnostics/guard"
106+
},
107+
{
108+
"source_path": "docs/developer-tools/ThrowHelper.md",
109+
"redirect_url": "/dotnet/communitytoolkit/diagnostics/throwhelper"
27110
}
28111
]
29112
}

docs/Nuget-Packages.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,30 @@ description: The Windows Community Toolkit is updated regularly with new control
55
keywords: windows 10, uwp, windows community toolkit, uwp community toolkit, uwp toolkit, nuget, visual studio
66
---
77

8-
# Windows Community Toolkit NuGet Packages
8+
# Community Toolkit NuGet Packages
99

1010
NuGet is a standard package manager for .Net applications that is built into Visual Studio. From your open solution choose the *Tools* menu, *NuGet Package Manager*, *Manage NuGet packages for solution...* to open the UI. Enter one of the package names below to search for it online.
1111

1212
| NuGet Package Name | Description |
1313
| --- | --- |
14-
| Microsoft.Toolkit | .NET Standard NuGet package containing common code |
15-
| Microsoft.Toolkit.HighPerformance | .NET Standard and .NET Core NuGet package with performance oriented helpers, extensions, etc. |
16-
| Microsoft.Toolkit.Parsers | .NET Standard NuGet package containing cross-platform parsers, such as Markdown and RSS |
17-
| Microsoft.Toolkit.Services | .NET Standard NuGet package containing cross-platform services |
18-
| Microsoft.Toolkit.Uwp | Main NuGet package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. |
19-
| Microsoft.Toolkit.Uwp.Notifications | Notifications Package - Generate tile, toast, and badge notifications for Windows 10 via code. Includes intellisense support to avoid having to use the XML syntax |
20-
| Microsoft.Toolkit.Uwp.Notifications.Javascript | Notification Packages for JavaScript |
21-
| Microsoft.Toolkit.Uwp.Services | Services Package - This NuGet package includes the service helpers for Facebook, LinkedIn, Microsoft Graph, Twitter and more |
14+
| CommunityToolkit.Common | .NET Standard NuGet package containing common code |
15+
| CommunityToolkit.Diagnostics | .NET Standard code helpers |
16+
| CommunityToolkit.HighPerformance | .NET Standard and .NET Core NuGet package with performance oriented helpers, extensions, etc. |
17+
| CommunityToolkit.Mvvm | [MVVM Toolkit](/dotnet/communitytoolkit/mvvm/) a modern, fast, and modular MVVM library for .NET Standard, platform and runtime agnostic |
18+
| CommunityToolkit.Maui | [MAUI Community Toolkit](/dotnet/communitytoolkit/maui) for .NET MAUI |
19+
| CommunityToolkit.WinUI.* | [WindowsAppSDK](/windows/apps/windows-app-sdk)/[WinUI 3](/windows/apps/winui/winui3) versions of the toolkit packages below. |
20+
| Microsoft.Toolkit.Uwp | Includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. |
2221
| Microsoft.Toolkit.Uwp.UI | UI Packages - XAML converters, Visual tree extensions, and other extensions and helpers for your XAML UI |
2322
| Microsoft.Toolkit.Uwp.UI.Animations | Animations and Composition behaviors such as Blur, Fade, Rotate, etc. |
24-
| Microsoft.Toolkit.Uwp.UI.Controls | XAML Controls such as RadialGauge, RangeSelector, etc. |
23+
| Microsoft.Toolkit.Uwp.UI.Behaviors | Extra behaviors built on top of the [XAML Behaviors](https://github.com/microsoft/XamlBehaviors/wiki) library. |
24+
| Microsoft.Toolkit.Uwp.UI.Controls | Wrapping package of all controls, for best disk footprint, use individual packages. |
25+
| Microsoft.Toolkit.Uwp.UI.Controls.Core | Common controls useful for a variety of applications. |
2526
| Microsoft.Toolkit.Uwp.UI.Controls.DataGrid | XAML DataGrid control |
26-
| Microsoft.Toolkit.Uwp.UI.Controls.Layout | XAML layout controls such as WrapLayout, StaggeredLayout, etc. |
27+
| Microsoft.Toolkit.Uwp.UI.Controls.Input | Controls related to retrieving information or values. |
28+
| Microsoft.Toolkit.Uwp.UI.Controls.Layout | Controls for various application layout scenarios. |
29+
| Microsoft.Toolkit.Uwp.UI.Controls.Markdown | Markdown renderer control. |
30+
| Microsoft.Toolkit.Uwp.UI.Controls.Media | Controls that depend on Win2D. |
31+
| Microsoft.Toolkit.Uwp.UI.Controls.Primitives | Panels and simple layout controls without stlyes |
2732
| Microsoft.Toolkit.Uwp.UI.Lottie | Library for rendering Adobe AfterEffects animations natively in Windows apps |
2833
| Microsoft.Toolkit.Uwp.UI.Media | Brushes, Win2D/Composition effects, and helpers to create visual effects |
2934
| Microsoft.Toolkit.Uwp.Connectivity | API helpers such as BluetoothLEHelper and Networking |
@@ -37,7 +42,7 @@ Searching in Visual Studio package manager you should see a list similar to the
3742

3843
## Update NuGet Packages
3944

40-
The Windows Community Toolkit is updated regularly with new controls, services, APIs, and more importantly, bug fixes. To make sure you are on the latest version, open your project in Visual Studio, choose the **Tools** menu, select **NuGet Package Manager** -> **Manage NuGet Packages for Solution...** and select the *Updates* tab. Select the package you want to update and click Instal to update to the latest version.
45+
The Windows Community Toolkit is updated regularly with new controls, services, APIs, and more importantly, bug fixes. To make sure you are on the latest version, open your project in Visual Studio, choose the **Tools** menu, select **NuGet Package Manager** -> **Manage NuGet Packages for Solution...** and select the *Updates* tab. Select the package you want to update and click Install to update to the latest version.
4146

4247
## Getting Started
4348

docs/archive/graph/providers/InteractiveProviderBehavior.md

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

docs/archive/graph/providers/MockProviderBehavior.md

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

docs/brushes/TilesBrush.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords: windows 10, uwp, windows community toolkit, uwp community toolkit, uwp
77

88
# TilesBrush
99

10-
The [TilesBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.tilesbrush) is a [Brush](/uwp/api/windows.ui.xaml.media.brush) that that displays a tiled image.
10+
The [TilesBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.tilesbrush) is a [Brush](/uwp/api/windows.ui.xaml.media.brush) that displays a tiled image.
1111

1212
> [!div class="nextstepaction"]
1313
> [Try it in the sample app](uwpct://Brushes?sample=TilesBrush)

docs/controls/HeaderedItemsControl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The [HeaderedItemsControl](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headere
2323

2424
<controls:HeaderedItemsControl>
2525
<!-- Header content or HeaderTemplate content -->
26-
</<controls:HeaderedItemsControl>
26+
</controls:HeaderedItemsControl>
2727
```
2828

2929
## Sample Output
@@ -53,7 +53,7 @@ The [HeaderedItemsControl](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headere
5353
<TextBlock Text="This is the header!" FontSize="16">
5454
</Border>
5555
</controls:HeaderedItemsControl.Header>
56-
</<controls:HeaderedItemsControl>
56+
</controls:HeaderedItemsControl>
5757
```
5858

5959
- Used to control the look of the header. The default value for the `HeaderTemplate` will display the string representation of the `Header`. Set this property if you need to bind the `Header` to an object.
@@ -67,7 +67,7 @@ The [HeaderedItemsControl](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headere
6767
<TextBlock Text="{Binding Title}">
6868
</DataTemplate>
6969
</controls:HeaderedItemsControl.HeaderTemplate>
70-
</<controls:HeaderedItemsControl>
70+
</controls:HeaderedItemsControl>
7171
```
7272

7373
## Sample Project

docs/controls/datagrid_guidance/styling_formatting_options.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ All individual parts of the DataGrid control are customizable through simple Sty
6666
* *RowHeaderStyle* : style that is used when rendering the row headers. The DataGrid control does not have a default visual for the row header. To provide one you must provide a `ContentTemplate` for `Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DataGridRowHeader`. For Example:
6767

6868
```xaml
69-
xmlns:wctprimitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
69+
xmlns:wctprimitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
7070

71+
// This will display the column headers as one cell with the heading text
72+
<controls:DataGrid.RowHeaderStyle>
7173
<Style TargetType="wctprimitives:DataGridRowHeader">
7274
<Setter Property="Template">
7375
<Setter.Value>
@@ -79,6 +81,24 @@ All individual parts of the DataGrid control are customizable through simple Sty
7981
</Setter.Value>
8082
</Setter>
8183
</Style>
84+
</controls:DataGrid.RowHeaderStyle>
85+
```
86+
87+
OR
88+
89+
```xaml
90+
// This will display the individual column headers if defined
91+
<controls:DataGrid.ColumnHeaderStyle>
92+
<Style TargetType="wctprimitives:DataGridColumnHeader">
93+
<Setter Property="Template">
94+
<Setter.Value>
95+
<ControlTemplate TargetType="wctprimitives:DataGridColumnHeader">
96+
<ContentPresenter Background="Red" />
97+
</ControlTemplate>
98+
</Setter.Value>
99+
</Setter>
100+
</Style>
101+
</controls:DataGrid.ColumnHeaderStyle>
82102
```
83103

84104
Whether defined as an inline style or as a resource, the Style defines the appearance of cells/rows/columns/headers in the data grid, and should specify the appropriate TargetType (say, **DataGridCell** for CellStyle). You typically specify setters for individual properties, and might also use a setter for the Template property if you wanted to change the composition of elements.

0 commit comments

Comments
 (0)