Alexandre Zollinger Chohfi
|
9ee95a387b
|
Merge branch 'main' into winui
# Conflicts:
# CommunityToolkit.WinUI.SampleApp/SamplePages/KeyDownTriggerBehavior/KeyDownTriggerBehaviorXaml.bind
# CommunityToolkit.WinUI.SampleApp/SamplePages/samples.json
# CommunityToolkit.WinUI.UI.Animations/CommunityToolkit.WinUI.UI.Animations.csproj
# CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
# CommunityToolkit.WinUI.UI.Animations/Properties/SkipLocalsInitAttribute.cs
# CommunityToolkit.WinUI.UI.Behaviors/Keyboard/KeyDownTriggerBehavior.cs
# CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
# CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs
# CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
# CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs
# Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
# Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
# Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
# UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
# Windows Community Toolkit.sln
|
2021-08-18 11:21:10 -07:00 |