diff --git a/components/CanvasLayout/samples/CanvasLayoutSample.xaml b/components/CanvasLayout/samples/CanvasLayoutSample.xaml index 1f8e4ef75..bcc9ccb4d 100644 --- a/components/CanvasLayout/samples/CanvasLayoutSample.xaml +++ b/components/CanvasLayout/samples/CanvasLayoutSample.xaml @@ -1,9 +1,9 @@ - + - + diff --git a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs index 38b0f02a0..563ba93dd 100644 --- a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs +++ b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using CommunityToolkit.Labs.WinUI; +using CommunityToolkit.WinUI.Controls; namespace CanvasLayoutExperiment.Samples; diff --git a/components/CanvasLayout/src/CanvasLayout.cs b/components/CanvasLayout/src/CanvasLayout.cs index a6ac2264a..afa2d0dd5 100644 --- a/components/CanvasLayout/src/CanvasLayout.cs +++ b/components/CanvasLayout/src/CanvasLayout.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace CommunityToolkit.Labs.WinUI; +namespace CommunityToolkit.WinUI.Controls; public partial class CanvasLayout : MUXC.VirtualizingLayout { diff --git a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/components/CanvasLayout/src/CommunityToolkit.WinUI.Controls.CanvasLayout.csproj similarity index 74% rename from components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj rename to components/CanvasLayout/src/CommunityToolkit.WinUI.Controls.CanvasLayout.csproj index dbf4ad75b..6b9e9d9f4 100644 --- a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj +++ b/components/CanvasLayout/src/CommunityToolkit.WinUI.Controls.CanvasLayout.csproj @@ -3,11 +3,15 @@ CanvasLayout This package contains a CanvasLayout Layout for ItemsRepeater. - + - CommunityToolkit.Labs.WinUI.CanvasLayoutRns + CommunityToolkit.WinUI.Controls.CanvasLayoutRns + + + $(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName) + diff --git a/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs b/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs index 4c401082a..91ca2e8f0 100644 --- a/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs +++ b/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using CommunityToolkit.Labs.WinUI; +using CommunityToolkit.WinUI.Controls; using CommunityToolkit.Tooling.TestGen; using CommunityToolkit.Tests; diff --git a/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml b/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml index 3d19b0d1f..e684e097f 100644 --- a/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml +++ b/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml @@ -2,8 +2,8 @@ - + diff --git a/components/CanvasView/samples/CanvasViewDragSample.xaml b/components/CanvasView/samples/CanvasViewDragSample.xaml index df67c15dd..86dc7b66d 100644 --- a/components/CanvasView/samples/CanvasViewDragSample.xaml +++ b/components/CanvasView/samples/CanvasViewDragSample.xaml @@ -1,17 +1,17 @@ - + - - + + - , + - - + + diff --git a/components/CanvasView/src/CanvasView.cs b/components/CanvasView/src/CanvasView.cs index 2268159ca..84ea30a72 100644 --- a/components/CanvasView/src/CanvasView.cs +++ b/components/CanvasView/src/CanvasView.cs @@ -5,10 +5,9 @@ #if NET8_0_OR_GREATER using System.Diagnostics.CodeAnalysis; #endif -using CommunityToolkit.Labs.WinUI.CanvasViewInternal; using CommunityToolkit.WinUI.Helpers; -namespace CommunityToolkit.Labs.WinUI; +namespace CommunityToolkit.WinUI.Controls; /// /// is an which uses a for the layout of its items. diff --git a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj b/components/CanvasView/src/CommunityToolkit.WinUI.Controls.CanvasView.csproj similarity index 74% rename from components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj rename to components/CanvasView/src/CommunityToolkit.WinUI.Controls.CanvasView.csproj index 8a6a33e3c..5107148c0 100644 --- a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj +++ b/components/CanvasView/src/CommunityToolkit.WinUI.Controls.CanvasView.csproj @@ -5,9 +5,13 @@ This package contains CanvasView. - CommunityToolkit.Labs.WinUI.CanvasViewRns + CommunityToolkit.WinUI.Controls.CanvasViewRns + + + $(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName) + diff --git a/components/CanvasView/src/FrameworkElementExtensions.cs b/components/CanvasView/src/FrameworkElementExtensions.cs index ad70d1122..91c043905 100644 --- a/components/CanvasView/src/FrameworkElementExtensions.cs +++ b/components/CanvasView/src/FrameworkElementExtensions.cs @@ -6,7 +6,7 @@ using System.Diagnostics.CodeAnalysis; #endif -namespace CommunityToolkit.Labs.WinUI.CanvasViewInternal; +namespace CommunityToolkit.WinUI.Controls; public static partial class FrameworkElementExtensions { diff --git a/components/CanvasView/tests/ExampleCanvasViewTestClass.cs b/components/CanvasView/tests/ExampleCanvasViewTestClass.cs index 7a709d64f..62144ebee 100644 --- a/components/CanvasView/tests/ExampleCanvasViewTestClass.cs +++ b/components/CanvasView/tests/ExampleCanvasViewTestClass.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using CommunityToolkit.Labs.WinUI; +using CommunityToolkit.WinUI.Controls; using CommunityToolkit.Tooling.TestGen; using CommunityToolkit.Tests; diff --git a/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml b/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml index 8db7d8979..028f5646d 100644 --- a/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml +++ b/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml @@ -2,13 +2,13 @@ - + diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml index 8f040ab1e..043e52c46 100644 --- a/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml +++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml @@ -2,7 +2,7 @@ /// Identifies the dependency property. /// @@ -79,8 +79,8 @@ public partial class MarkdownTextBlock nameof(DisableHtmlProperty), typeof(bool), typeof(MarkdownTextBlock), - new PropertyMetadata(false)); - + new PropertyMetadata(false)); + /// /// Identifies the dependency property. /// @@ -88,7 +88,7 @@ public partial class MarkdownTextBlock nameof(DisableLinksProperty), typeof(bool), typeof(MarkdownTextBlock), - new PropertyMetadata(false)); + new PropertyMetadata(false)); /// /// Identifies the dependency property. @@ -166,8 +166,8 @@ public bool UseAutoLinks { get => (bool)GetValue(UseAutoLinksProperty); set => SetValue(UseAutoLinksProperty, value); - } - + } + /// /// If true, Disables HTML parsing. /// @@ -175,8 +175,8 @@ public bool DisableHtml { get => (bool)GetValue(DisableHtmlProperty); set => SetValue(DisableHtmlProperty, value); - } - + } + /// /// If true, Disables link parsing. /// @@ -184,7 +184,7 @@ public bool DisableLinks { get => (bool)GetValue(DisableLinksProperty); set => SetValue(DisableLinksProperty, value); - } + } /// /// If true, considers single newlines as hardline breaks. diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml index 30660e11b..8b187a5ac 100644 --- a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml +++ b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml @@ -1,15 +1,15 @@  + xmlns:controls="using:CommunityToolkit.WinUI.Controls">