From 078a32a6b4aa9ffe734fbbabbd556c2d23c5269b Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Tue, 30 Mar 2021 10:53:47 -0700 Subject: [PATCH] More global replace. --- .github/ISSUE_TEMPLATE/win32_controls.md | 2 +- .../Collections/IReadOnlyObservableGroup.cs | 2 +- .../Collections/ObservableGroup.cs | 2 +- .../Collections/ObservableGroupedCollection.cs | 2 +- .../ObservableGroupedCollectionExtensions.cs | 2 +- .../Collections/ReadOnlyObservableGroup.cs | 2 +- .../ReadOnlyObservableGroupedCollection.cs | 2 +- CommunityToolkit.Common/Converters.cs | 2 +- .../Deferred/DeferredCancelEventArgs.cs | 2 +- .../Deferred/DeferredEventArgs.cs | 2 +- .../Deferred/EventDeferral.cs | 2 +- .../Extensions/ArrayExtensions.cs | 2 +- .../Extensions/EventHandlerExtensions.cs | 2 +- .../Extensions/StringExtensions.cs | 2 +- .../Extensions/TaskExtensions.cs | 2 +- .../IIncrementalSource.cs | 2 +- .../Extensions/TypeExtensions.cs | 2 +- .../Extensions/ValueTypeExtensions.cs | 2 +- .../Generated/Guard.Collection.g.cs | 2 +- .../Generated/Guard.Collection.tt | 2 +- .../Generated/Guard.Comparable.Numeric.g.cs | 2 +- .../Generated/Guard.Comparable.Numeric.tt | 2 +- .../Generated/ThrowHelper.Collection.g.cs | 2 +- .../Generated/ThrowHelper.Collection.tt | 2 +- .../Guard.Comparable.Generic.cs | 2 +- .../Guard.Comparable.Numeric.cs | 2 +- CommunityToolkit.Diagnostics/Guard.IO.cs | 2 +- CommunityToolkit.Diagnostics/Guard.String.cs | 2 +- CommunityToolkit.Diagnostics/Guard.Tasks.cs | 2 +- CommunityToolkit.Diagnostics/Guard.cs | 2 +- .../Guard.Collection.Generic.ThrowHelper.cs | 2 +- .../Guard.Comparable.Generic.ThrowHelper.cs | 2 +- .../Guard.Comparable.Numeric.ThrowHelper.cs | 2 +- .../Internals/Guard.IO.ThrowHelper.cs | 2 +- .../Internals/Guard.String.ThrowHelper.cs | 2 +- .../Internals/Guard.Tasks.ThrowHelper.cs | 2 +- .../Internals/Guard.ThrowHelper.cs | 2 +- .../ThrowHelper.Generic.cs | 2 +- CommunityToolkit.Diagnostics/ThrowHelper.cs | 2 +- CommunityToolkit.HighPerformance/Box{T}.cs | 4 ++-- .../Buffers/ArrayPoolBufferWriter{T}.cs | 8 ++++---- .../Buffers/Enums/AllocationMode.cs | 2 +- .../Buffers/Interfaces/IBuffer{T}.cs | 2 +- .../Internals/ArrayMemoryManager{TFrom,TTo}.cs | 6 +++--- .../Internals/Interfaces/IMemoryManager.cs | 2 +- .../Internals/ProxyMemoryManager{TFrom,TTo}.cs | 6 +++--- .../Internals/RawObjectMemoryManager{T}.cs | 4 ++-- .../Internals/StringMemoryManager{TTo}.cs | 6 +++--- .../Buffers/MemoryBufferWriter{T}.cs | 6 +++--- .../Buffers/MemoryOwner{T}.cs | 6 +++--- .../Buffers/SpanOwner{T}.cs | 6 +++--- .../Buffers/StringPool.cs | 6 +++--- .../Buffers/Views/MemoryDebugView{T}.cs | 2 +- .../Enumerables/ReadOnlyRefEnumerable{T}.cs | 8 ++++---- .../Enumerables/ReadOnlySpanEnumerable{T}.cs | 2 +- .../Enumerables/ReadOnlySpanTokenizer{T}.cs | 6 +++--- .../Enumerables/RefEnumerable{T}.cs | 8 ++++---- .../Enumerables/SpanEnumerable{T}.cs | 2 +- .../Enumerables/SpanTokenizer{T}.cs | 2 +- .../Extensions/ArrayExtensions.1D.cs | 10 +++++----- .../Extensions/ArrayExtensions.2D.cs | 12 ++++++------ .../Extensions/ArrayExtensions.3D.cs | 10 +++++----- .../ArrayPoolBufferWriterExtensions.cs | 6 +++--- .../Extensions/ArrayPoolExtensions.cs | 2 +- .../Extensions/BoolExtensions.cs | 2 +- .../Extensions/HashCodeExtensions.cs | 4 ++-- .../Extensions/IBufferWriterExtensions.cs | 6 +++--- .../Extensions/IMemoryOwnerExtensions.cs | 4 ++-- .../Extensions/ListExtensions.cs | 2 +- .../Extensions/MemoryExtensions.cs | 4 ++-- .../Extensions/NullableExtensions.cs | 2 +- .../Extensions/ReadOnlyMemoryExtensions.cs | 8 ++++---- .../Extensions/ReadOnlySpanExtensions.cs | 6 +++--- .../Extensions/SpanExtensions.cs | 6 +++--- .../Extensions/SpinLockExtensions.cs | 2 +- .../Extensions/StreamExtensions.cs | 2 +- .../Extensions/StringExtensions.cs | 6 +++--- .../Helpers/BitHelper.cs | 2 +- .../Helpers/HashCode{T}.cs | 6 +++--- .../Helpers/Internals/BitOperations.cs | 2 +- .../Helpers/Internals/RefEnumerableHelper.cs | 2 +- .../Helpers/Internals/RuntimeHelpers.cs | 2 +- .../Helpers/Internals/SpanHelper.Count.cs | 2 +- .../Helpers/Internals/SpanHelper.Hash.cs | 2 +- .../Helpers/ObjectMarshal.cs | 2 +- .../Helpers/ParallelHelper.For.IAction.cs | 2 +- .../Helpers/ParallelHelper.For.IAction2D.cs | 2 +- .../ParallelHelper.ForEach.IInAction.cs | 2 +- .../ParallelHelper.ForEach.IInAction2D.cs | 2 +- .../ParallelHelper.ForEach.IRefAction.cs | 2 +- .../ParallelHelper.ForEach.IRefAction2D.cs | 2 +- .../Helpers/ParallelHelper.ThrowExceptions.cs | 2 +- .../Memory/Internals/OverflowHelper.cs | 2 +- .../Memory/Internals/ThrowHelper.cs | 2 +- .../Memory/Memory2D{T}.cs | 14 +++++++------- .../Memory/ReadOnlyMemory2D{T}.cs | 14 +++++++------- .../Memory/ReadOnlySpan2D{T}.Enumerator.cs | 8 ++++---- .../Memory/ReadOnlySpan2D{T}.cs | 16 ++++++++-------- .../Memory/Span2D{T}.Enumerator.cs | 8 ++++---- .../Memory/Span2D{T}.cs | 16 ++++++++-------- .../Memory/Views/MemoryDebugView2D{T}.cs | 2 +- .../NullableReadOnlyRef{T}.cs | 2 +- .../NullableRef{T}.cs | 2 +- .../ReadOnlyRef{T}.cs | 4 ++-- CommunityToolkit.HighPerformance/Ref{T}.cs | 4 ++-- .../IBufferWriterStream{TWriter}.Memory.cs | 2 +- .../Streams/IBufferWriterStream{TWriter}.cs | 2 +- .../Streams/IMemoryOwnerStream{TSource}.cs | 2 +- .../Streams/MemoryStream.ThrowExceptions.cs | 2 +- .../Streams/MemoryStream.Validate.cs | 2 +- .../Streams/MemoryStream.cs | 2 +- .../Streams/MemoryStream{TSource}.Memory.cs | 2 +- .../Streams/MemoryStream{TSource}.cs | 2 +- .../Streams/Sources/ArrayBufferWriterOwner.cs | 4 ++-- .../Streams/Sources/ArrayOwner.cs | 2 +- .../Streams/Sources/IBufferWriterOwner.cs | 4 ++-- .../Streams/Sources/Interfaces/ISpanOwner.cs | 2 +- .../Streams/Sources/MemoryManagerOwner.cs | 2 +- .../ComponentModel/ObservableObject.cs | 2 +- .../ComponentModel/ObservableRecipient.cs | 6 +++--- .../ComponentModel/ObservableValidator.cs | 2 +- .../DependencyInjection/Ioc.cs | 2 +- .../Input/AsyncRelayCommand.cs | 4 ++-- .../Input/AsyncRelayCommand{T}.cs | 4 ++-- .../Input/Interfaces/IAsyncRelayCommand.cs | 2 +- .../Input/Interfaces/IAsyncRelayCommand{T}.cs | 2 +- .../Input/Interfaces/IRelayCommand.cs | 2 +- .../Input/Interfaces/IRelayCommand{T}.cs | 2 +- CommunityToolkit.Mvvm/Input/RelayCommand.cs | 2 +- CommunityToolkit.Mvvm/Input/RelayCommand{T}.cs | 2 +- CommunityToolkit.Mvvm/Messaging/IMessenger.cs | 2 +- .../Messaging/IMessengerExtensions.cs | 6 +++--- .../Messaging/IRecipient{TMessage}.cs | 2 +- .../Messaging/Internals/Type2.cs | 2 +- .../Messaging/Internals/Unit.cs | 2 +- .../AsyncCollectionRequestMessage{T}.cs | 2 +- .../Messages/AsyncRequestMessage{T}.cs | 2 +- .../Messages/CollectionRequestMessage{T}.cs | 2 +- .../Messages/PropertyChangedMessage{T}.cs | 2 +- .../Messaging/Messages/RequestMessage{T}.cs | 2 +- .../Messages/ValueChangedMessage{T}.cs | 2 +- .../Messaging/StrongReferenceMessenger.cs | 4 ++-- .../Messaging/WeakReferenceMessenger.cs | 6 +++--- ....WpfCore.SampleApp.PackagingProject.wapproj | 4 ++-- .../Package.appxmanifest | 8 ++++---- .../App.xaml | 4 ++-- .../App.xaml.cs | 2 +- .../MainWindow.xaml | 4 ++-- .../MainWindow.xaml.cs | 2 +- .../MyToastActions.cs | 2 +- CommunityToolkit.Win32/README.md | 2 +- ...CommunityToolkit.WinUI.Notifications.nuspec | 2 +- .../CommunityToolkit.WinUI.SampleApp.csproj | 6 +++--- .../Controls/SampleAppMarkdownRenderer.cs | 8 ++++---- .../Models/Sample.cs | 6 +++--- .../SamplePages/Graph/LoginButtonXaml.bind | 4 ++-- .../SamplePages/Graph/PeoplePickerXaml.bind | 4 ++-- .../SamplePages/Graph/PersonViewXaml.bind | 4 ++-- .../PeopleSource.cs | 2 +- .../ObservableGroup/ObservableGroupPage.xaml | 2 +- .../ObservableGroupPage.xaml.cs | 2 +- .../StringExtensionsPage.xaml.cs | 2 +- .../SamplePages/samples.json | 16 ++++++++-------- .../TextToolbar/TextToolbar.cs | 1 - .../Utilities/WeakEventListener.cs | 2 +- .../TokenItemAddingEventArgs.cs | 2 +- .../TokenItemRemovingEventArgs.cs | 2 +- .../MarkdownTextBlock.Methods.cs | 2 +- .../Parsers/Constants.cs | 2 +- .../Parsers/Core/IParser.cs | 2 +- .../Parsers/Core/ParseHelpers.cs | 2 +- .../Parsers/Core/SchemaBase.cs | 2 +- .../Parsers/Core/StringValueAttribute.cs | 2 +- .../Parsers/Markdown/Blocks/CodeBlock.cs | 5 ++--- .../Parsers/Markdown/Blocks/HeaderBlock.cs | 9 ++++----- .../Markdown/Blocks/HorizontalRuleBlock.cs | 4 ++-- .../Markdown/Blocks/LinkReferenceBlock.cs | 6 +++--- .../Markdown/Blocks/List/ListItemBlock.cs | 2 +- .../Markdown/Blocks/List/ListItemBuilder.cs | 2 +- .../Markdown/Blocks/List/ListItemPreamble.cs | 2 +- .../Markdown/Blocks/List/NestedListInfo.cs | 2 +- .../Parsers/Markdown/Blocks/ListBlock.cs | 9 ++++----- .../Parsers/Markdown/Blocks/ParagraphBlock.cs | 7 +++---- .../Parsers/Markdown/Blocks/QuoteBlock.cs | 2 +- .../Parsers/Markdown/Blocks/TableBlock.cs | 11 +++++------ .../Parsers/Markdown/Blocks/YamlHeaderBlock.cs | 7 +++---- .../Parsers/Markdown/Enums/ColumnAlignment.cs | 2 +- .../Parsers/Markdown/Enums/HyperlinkType.cs | 2 +- .../Markdown/Enums/InlineParseMethod.cs | 2 +- .../Parsers/Markdown/Enums/ListStyle.cs | 2 +- .../Markdown/Enums/MarkdownBlockType.cs | 2 +- .../Markdown/Enums/MarkdownInlineType.cs | 2 +- .../Parsers/Markdown/Helpers/Common.cs | 4 ++-- .../Markdown/Helpers/DebuggingReporter.cs | 2 +- .../Markdown/Helpers/InlineParseResult.cs | 4 ++-- .../Markdown/Helpers/InlineTripCharHelper.cs | 2 +- .../Parsers/Markdown/Helpers/LineInfo.cs | 2 +- .../Markdown/Inlines/BoldItalicTextInline.cs | 10 +++++----- .../Parsers/Markdown/Inlines/BoldTextInline.cs | 10 +++++----- .../Parsers/Markdown/Inlines/CodeInline.cs | 8 ++++---- .../Parsers/Markdown/Inlines/CommentInline.cs | 6 +++--- .../Markdown/Inlines/EmojiInline.EmojiCodes.cs | 2 +- .../Parsers/Markdown/Inlines/EmojiInline.cs | 8 ++++---- .../Markdown/Inlines/HyperlinkInline.cs | 4 ++-- .../Markdown/Inlines/IInlineContainer.cs | 2 +- .../Parsers/Markdown/Inlines/IInlineLeaf.cs | 2 +- .../Parsers/Markdown/Inlines/ILinkElement.cs | 2 +- .../Parsers/Markdown/Inlines/ImageInline.cs | 8 ++++---- .../Markdown/Inlines/ItalicTextInline.cs | 10 +++++----- .../Markdown/Inlines/LinkAnchorInline.cs | 10 +++++----- .../Markdown/Inlines/MarkdownLinkInline.cs | 18 +++++++++--------- .../Inlines/StrikethroughTextInline.cs | 10 +++++----- .../Markdown/Inlines/SubscriptTextInline.cs | 10 +++++----- .../Markdown/Inlines/SuperscriptTextInline.cs | 16 ++++++++-------- .../Parsers/Markdown/Inlines/TextRunInline.cs | 2 +- .../Parsers/Markdown/MarkdownBlock.cs | 2 +- .../Parsers/Markdown/MarkdownDocument.cs | 11 +++++------ .../Parsers/Markdown/MarkdownElement.cs | 2 +- .../Parsers/Markdown/MarkdownInline.cs | 2 +- .../Parsers/Markdown/Render/IRenderContext.cs | 2 +- .../Render/MarkdownRendererBase.Blocks.cs | 4 ++-- .../Render/MarkdownRendererBase.Inlines.cs | 4 ++-- .../Markdown/Render/MarkdownRendererBase.cs | 6 +++--- .../Render/InlineRenderContext.cs | 2 +- .../Render/MarkdownRenderer.Blocks.cs | 6 +++--- .../Render/MarkdownRenderer.Inlines.cs | 6 +++--- .../Render/MarkdownRenderer.cs | 8 ++++---- .../Render/RenderContext.cs | 2 +- .../Render/UIElementCollectionRenderContext.cs | 2 +- .../FileSizeToFriendlyStringConverter.cs | 2 +- .../Converters/TaskResultConverter.cs | 2 +- .../TextBoxExtensions.Regex.Internals.cs | 2 +- .../CommunityToolkit.WinUI.csproj | 2 +- .../Extensions/TypedEventHandlerExtensions.cs | 2 +- .../IncrementalLoadingCollection.cs | 2 +- Directory.Build.props | 2 +- .../CommunityToolkit.Common/MainPage.xaml.cs | 2 +- .../MainPage.xaml.cs | 2 +- .../MainPage.xaml.cs | 2 +- .../CommunityToolkit.Mvvm/MainPage.xaml.cs | 2 +- SmokeTests/SmokeTests.proj | 8 ++++---- ThirdPartyNotices.txt | 4 ++-- UITests/UITests.App/App.AppService.xaml.cs | 2 +- UITests/UITests.App/MainTestHost.xaml.cs | 2 +- UITests/UITests.App/RequestPageMessage.cs | 2 +- UITests/UITests.App/UITests.App.csproj | 12 ++++++------ UWP Community Toolkit.sln.GhostDoc.xml | 4 ++-- UnitTests/Extensions/Test_TaskExtensions.cs | 2 +- .../UnitTests.HighPerformance.NetCore.csproj | 2 +- .../Buffers/Test_ArrayPoolBufferWriter{T}.cs | 4 ++-- .../Buffers/Test_MemoryBufferWriter{T}.cs | 2 +- .../Buffers/Test_MemoryOwner{T}.cs | 2 +- .../Buffers/Test_SpanOwner{T}.cs | 2 +- .../Buffers/Test_StringPool.cs | 8 ++++---- .../Test_ReadOnlyRefEnumerable{T}.cs | 2 +- .../Enumerables/Test_RefEnumerable{T}.cs | 2 +- .../Extensions/Test_ArrayExtensions.1D.cs | 2 +- .../Extensions/Test_ArrayExtensions.2D.cs | 4 ++-- .../Extensions/Test_ArrayExtensions.3D.cs | 2 +- .../Extensions/Test_ArrayPoolExtensions.cs | 2 +- .../Extensions/Test_BoolExtensions.cs | 2 +- .../Extensions/Test_HashCodeExtensions.cs | 4 ++-- .../Extensions/Test_IBufferWriterExtensions.cs | 4 ++-- .../Extensions/Test_IMemoryOwnerExtensions.cs | 4 ++-- .../Extensions/Test_MemoryExtensions.cs | 2 +- .../Extensions/Test_NullableExtensions.cs | 2 +- .../Test_ReadOnlyMemoryExtensions.cs | 2 +- .../Test_ReadOnlySpanExtensions.Count.cs | 2 +- .../Extensions/Test_ReadOnlySpanExtensions.cs | 2 +- .../Extensions/Test_SpanExtensions.cs | 2 +- .../Extensions/Test_SpinLockExtensions.cs | 2 +- .../Extensions/Test_StreamExtensions.cs | 2 +- .../Extensions/Test_StringExtensions.cs | 2 +- .../Helpers/Test_BitHelper.cs | 2 +- .../Helpers/Test_HashCode{T}.cs | 2 +- .../Helpers/Test_ObjectMarshal.cs | 2 +- .../Helpers/Test_ParallelHelper.For.cs | 4 ++-- .../Helpers/Test_ParallelHelper.For2D.cs | 2 +- .../Helpers/Test_ParallelHelper.ForEach.In.cs | 2 +- .../Test_ParallelHelper.ForEach.In2D.cs | 4 ++-- .../Helpers/Test_ParallelHelper.ForEach.Ref.cs | 2 +- .../Test_ParallelHelper.ForEach.Ref2D.cs | 4 ++-- .../Test_ParallelHelper.ThrowExceptions.cs | 2 +- .../Memory/Test_Memory2D{T}.cs | 4 ++-- .../Memory/Test_ReadOnlyMemory2D{T}.cs | 4 ++-- .../Memory/Test_ReadOnlySpan2D{T}.cs | 6 +++--- .../Memory/Test_Span2D{T}.cs | 6 +++--- .../Streams/Test_IBufferWriterStream.cs | 4 ++-- .../Streams/Test_IMemoryOwnerStream.cs | 4 ++-- .../Test_MemoryStream.ThrowExceptions.cs | 2 +- .../Streams/Test_MemoryStream.cs | 2 +- .../Test_Box{T}.cs | 2 +- .../Test_NullableReadOnlyRef{T}.cs | 2 +- .../Test_NullableRef{T}.cs | 2 +- .../Test_ReadOnlyRef{T}.cs | 2 +- .../Test_Ref{T}.cs | 2 +- .../UnitTests.HighPerformance.UWP.csproj | 4 ++-- .../UnitTests.NetCore/UnitTests.NetCore.csproj | 6 +++--- .../Collections/ObservableGroupTests.cs | 2 +- ...servableGroupedCollectionExtensionsTests.cs | 2 +- .../ObservableGroupedCollectionTests.cs | 2 +- .../ReadOnlyObservableGroupTests.cs | 2 +- ...ReadOnlyObservableGroupedCollectionTests.cs | 2 +- .../Diagnostics/Test_Guard.Array.cs | 2 +- .../Test_Guard.Comparable.Numeric.cs | 2 +- .../UnitTests.Shared/Diagnostics/Test_Guard.cs | 2 +- .../Diagnostics/Test_ThrowHelper.cs | 2 +- .../Extensions/Test_ArrayExtensions.cs | 2 +- .../Extensions/Test_EventHandlerExtensions.cs | 2 +- .../Extensions/Test_TaskExtensions.cs | 2 +- .../Extensions/Test_TypeExtensions.cs | 2 +- .../Extensions/Test_ValueTypeExtensions.cs | 2 +- .../Mvvm/Test_AsyncRelayCommand.cs | 2 +- .../Mvvm/Test_AsyncRelayCommand{T}.cs | 2 +- .../Mvvm/Test_Messenger.Request.cs | 4 ++-- .../UnitTests.Shared/Mvvm/Test_Messenger.cs | 2 +- .../Mvvm/Test_ObservableObject.cs | 2 +- .../Mvvm/Test_ObservableRecipient.cs | 6 +++--- .../Mvvm/Test_ObservableValidator.cs | 2 +- .../UnitTests.Shared/Mvvm/Test_RelayCommand.cs | 2 +- .../Mvvm/Test_RelayCommand{T}.cs | 2 +- .../UnitTests.UWP/Markdown/Parse/BoldTests.cs | 4 ++-- .../UnitTests.UWP/Markdown/Parse/CodeTests.cs | 4 ++-- .../Markdown/Parse/HeaderTests.cs | 6 +++--- .../Markdown/Parse/HorizontalRuleTests.cs | 4 ++-- .../Markdown/Parse/HyperlinkTests.cs | 6 +++--- .../Markdown/Parse/ImageInlineTests.cs | 4 ++-- .../Markdown/Parse/ItalicTests.cs | 4 ++-- .../UnitTests.UWP/Markdown/Parse/ListTests.cs | 6 +++--- .../Markdown/Parse/MarkdownLinkTests.cs | 6 +++--- .../Markdown/Parse/ParagraphTests.cs | 4 ++-- .../Markdown/Parse/ParseTestBase.cs | 4 ++-- .../Parse/ParseTestExtensionMethods.cs | 6 +++--- .../UnitTests.UWP/Markdown/Parse/QuoteTests.cs | 6 +++--- .../Markdown/Parse/StrikethroughTests.cs | 4 ++-- .../Markdown/Parse/SubscriptTests.cs | 4 ++-- .../Markdown/Parse/SuperscriptTests.cs | 4 ++-- .../UnitTests.UWP/Markdown/Parse/TableTests.cs | 6 +++--- ...TokenizingTextBox_InterspersedCollection.cs | 2 +- .../UI/Controls/Test_UniformGrid_FreeSpots.cs | 2 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 12 ++++++------ .../UnitTests.XamlIslands.UWPApp/App.xaml | 2 +- .../UnitTests.XamlIslands.UWPApp/App.xaml.cs | 2 +- .../UnitTests.XamlIslands.UWPApp.csproj | 6 +++--- UnitTests/UnitTests.XamlIslands/Program.cs | 2 +- .../UnitTests.XamlIslands.csproj | 2 +- Windows Community Toolkit.sln | 12 ++++++------ readme.md | 2 +- 348 files changed, 630 insertions(+), 638 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/win32_controls.md b/.github/ISSUE_TEMPLATE/win32_controls.md index fe89e4fab..6ba25304d 100644 --- a/.github/ISSUE_TEMPLATE/win32_controls.md +++ b/.github/ISSUE_TEMPLATE/win32_controls.md @@ -10,7 +10,7 @@ assignees: '' - + diff --git a/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml index 7ca996e8e..37856cd41 100644 --- a/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml @@ -1,7 +1,7 @@ - + xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp"> diff --git a/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs index a3cde403c..ae10bdefc 100644 --- a/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs @@ -5,7 +5,7 @@ using System.Windows; using CommunityToolkit.WinUI.Notifications; -namespace CommunityToolkit.Net.Win32.WpfCore.SampleApp +namespace CommunityToolkit.Win32.WpfCore.SampleApp { /// /// Interaction logic for App.xaml diff --git a/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml index 9e27ee722..9df8936f4 100644 --- a/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs index bfd00eafa..56ba7a357 100644 --- a/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs @@ -14,7 +14,7 @@ using CommunityToolkit.WinUI.Notifications; using Windows.Services.Maps; using Windows.UI.Notifications; -namespace CommunityToolkit.Net.Win32.WpfCore.SampleApp +namespace CommunityToolkit.Win32.WpfCore.SampleApp { /// /// Interaction logic for MainWindow.xaml diff --git a/CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.cs index 579c33860..0a8969e33 100644 --- a/CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.cs +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.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.Net.Win32.WpfCore.SampleApp +namespace CommunityToolkit.Win32.WpfCore.SampleApp { public enum MyToastActions { diff --git a/CommunityToolkit.Win32/README.md b/CommunityToolkit.Win32/README.md index f260a73f0..d4528e48e 100644 --- a/CommunityToolkit.Win32/README.md +++ b/CommunityToolkit.Win32/README.md @@ -1,3 +1,3 @@ # Windows Community Toolkit - WPF and Windows Forms -The source has moved to a new repository: https://github.com/windows-toolkit/CommunityToolkit.Net.Win32 \ No newline at end of file +The source has moved to a new repository: https://github.com/windows-toolkit/CommunityToolkit.Win32 \ No newline at end of file diff --git a/CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.nuspec b/CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.nuspec index fba550773..500f05cd1 100644 --- a/CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.nuspec +++ b/CommunityToolkit.WinUI.Notifications/CommunityToolkit.WinUI.Notifications.nuspec @@ -4,7 +4,7 @@ CommunityToolkit.WinUI.Notifications $version$ Windows Community Toolkit Notifications - CommunityToolkit.Net,dotnetfoundation + CommunityToolkit.Common,dotnetfoundation true MIT https://github.com/windows-toolkit/WindowsCommunityToolkit diff --git a/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj b/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj index f7822ae62..5ae1d1787 100644 --- a/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj +++ b/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj @@ -25,7 +25,7 @@ 10.1901.28001 --> @@ -126,9 +126,9 @@ {75f9ee44-3efa-47bc-aedd-351b9834a0af} CommunityToolkit.WinUI.UI.Media - + {6fe128a8-cefa-4a61-a987-ec92de6b538e} - CommunityToolkit.Net + CommunityToolkit.Common {b24a296c-b3eb-4e06-a64e-74ac2d1acc91} diff --git a/CommunityToolkit.WinUI.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/CommunityToolkit.WinUI.SampleApp/Controls/SampleAppMarkdownRenderer.cs index b6feb0e24..2e951967f 100644 --- a/CommunityToolkit.WinUI.SampleApp/Controls/SampleAppMarkdownRenderer.cs +++ b/CommunityToolkit.WinUI.SampleApp/Controls/SampleAppMarkdownRenderer.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Linq; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; -using CommunityToolkit.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Render; using CommunityToolkit.WinUI.Helpers; using CommunityToolkit.WinUI.UI.Controls.Markdown.Render; using Microsoft.UI; diff --git a/CommunityToolkit.WinUI.SampleApp/Models/Sample.cs b/CommunityToolkit.WinUI.SampleApp/Models/Sample.cs index 747c4f1a0..7268f00dd 100644 --- a/CommunityToolkit.WinUI.SampleApp/Models/Sample.cs +++ b/CommunityToolkit.WinUI.SampleApp/Models/Sample.cs @@ -18,8 +18,8 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; // TODO Reintroduce graph controls -// using CommunityToolkit.Net.Graph.Converters; -// using CommunityToolkit.Net.Graph.Providers; +// using CommunityToolkit.Common.Graph.Converters; +// using CommunityToolkit.Common.Graph.Providers; using CommunityToolkit.WinUI.Helpers; using CommunityToolkit.WinUI.Input.GazeInteraction; using CommunityToolkit.WinUI.SampleApp.Models; @@ -660,7 +660,7 @@ namespace CommunityToolkit.WinUI.SampleApp StackMode.Replace.GetType(), // CommunityToolkit.WinUI.UI.Controls.Core // TODO Reintroduce graph controls - // typeof(UserToPersonConverter)) // Search in CommunityToolkit.Net.Graph.Controls + // typeof(UserToPersonConverter)) // Search in CommunityToolkit.Common.Graph.Controls EasingType.Default.GetType(), // CommunityToolkit.WinUI.UI.Animations typeof(ImageCache), // Search in CommunityToolkit.WinUI.UI Interaction.Enabled.GetType(), // CommunityToolkit.WinUI.Input.GazeInteraction diff --git a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/LoginButtonXaml.bind b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/LoginButtonXaml.bind index b2c005381..80a5758de 100644 --- a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/LoginButtonXaml.bind +++ b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/LoginButtonXaml.bind @@ -3,8 +3,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" - xmlns:wgt="using:CommunityToolkit.Net.Graph.Controls" - xmlns:providers="using:CommunityToolkit.Net.Graph.Providers" + xmlns:wgt="using:CommunityToolkit.Common.Graph.Controls" + xmlns:providers="using:CommunityToolkit.Common.Graph.Providers" mc:Ignorable="d"> diff --git a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind index 864bce6a0..eed16ebca 100644 --- a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind +++ b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind @@ -4,8 +4,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" - xmlns:wgt="using:CommunityToolkit.Net.Graph.Controls" - xmlns:providers="using:CommunityToolkit.Net.Graph.Providers" + xmlns:wgt="using:CommunityToolkit.Common.Graph.Controls" + xmlns:providers="using:CommunityToolkit.Common.Graph.Providers" mc:Ignorable="d"> diff --git a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PersonViewXaml.bind b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PersonViewXaml.bind index 781a8b7b9..97f53c317 100644 --- a/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PersonViewXaml.bind +++ b/CommunityToolkit.WinUI.SampleApp/SamplePages/Graph/PersonViewXaml.bind @@ -3,8 +3,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" - xmlns:wgt="using:CommunityToolkit.Net.Graph.Controls" - xmlns:providers="using:CommunityToolkit.Net.Graph.Providers" + xmlns:wgt="using:CommunityToolkit.Common.Graph.Controls" + xmlns:providers="using:CommunityToolkit.Common.Graph.Providers" mc:Ignorable="d"> diff --git a/CommunityToolkit.WinUI.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs b/CommunityToolkit.WinUI.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs index c9c6d887b..6db86aa26 100644 --- a/CommunityToolkit.WinUI.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs +++ b/CommunityToolkit.WinUI.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.SampleApp.SamplePages /// A sample implementation of the interface. /// /// - public class PeopleSource : Net.Collections.IIncrementalSource + public class PeopleSource : CommunityToolkit.Common.Collections.IIncrementalSource { private readonly List _people; diff --git a/CommunityToolkit.WinUI.SampleApp/SamplePages/ObservableGroup/ObservableGroupPage.xaml b/CommunityToolkit.WinUI.SampleApp/SamplePages/ObservableGroup/ObservableGroupPage.xaml index ca30130cd..b6529b75a 100644 --- a/CommunityToolkit.WinUI.SampleApp/SamplePages/ObservableGroup/ObservableGroupPage.xaml +++ b/CommunityToolkit.WinUI.SampleApp/SamplePages/ObservableGroup/ObservableGroupPage.xaml @@ -1,7 +1,7 @@  /// Type of instance listening for the event. /// Type of source for the event. diff --git a/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs b/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs index 590b8e127..c89359f1e 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.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.Net.Deferred; +using CommunityToolkit.Common.Deferred; namespace CommunityToolkit.WinUI.UI.Controls { diff --git a/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs index 157a1be8e..cf2456cb0 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.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.Net.Deferred; +using CommunityToolkit.Common.Deferred; namespace CommunityToolkit.WinUI.UI.Controls { diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs index b6cd1fe68..3924b87ee 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs @@ -8,7 +8,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using ColorCode; -using CommunityToolkit.Net.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown; using CommunityToolkit.WinUI.UI.Controls.Markdown.Render; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Constants.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Constants.cs index 33d55b9c9..981b6c79c 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Constants.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Constants.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.Net.Parsers +namespace CommunityToolkit.Common.Parsers { internal static class Constants { diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/IParser.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/IParser.cs index c73bbc6ea..01685c8e9 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/IParser.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/IParser.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace CommunityToolkit.Net.Parsers +namespace CommunityToolkit.Common.Parsers { /// /// Parser interface. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs index fdfbe3147..dcb3a8297 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Core +namespace CommunityToolkit.Common.Parsers.Core { /// /// This class offers helpers for Parsing. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs index 8c1bd598a..455df5f22 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers +namespace CommunityToolkit.Common.Parsers { /// /// Strong typed schema base class. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs index 8e2813e7b..50d8d51dd 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Core +namespace CommunityToolkit.Common.Parsers.Core { /// /// The StringValue attribute is used as a helper to decorate enum values with string representations. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs index 335d91bb3..9173cb3c0 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs @@ -4,9 +4,8 @@ using System; using System.Text; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a block of text that is displayed in a fixed-width font. Inline elements and @@ -57,7 +56,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks Or the code block starts and ends with ``` */ - foreach (var lineInfo in Common.ParseLines(markdown, start, maxEnd, quoteDepth)) + foreach (var lineInfo in Helpers.Common.ParseLines(markdown, start, maxEnd, quoteDepth)) { int pos = lineInfo.StartOfLine; if (pos < maxEnd && markdown[pos] == '`') diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs index 520dfa865..d1d58d702 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a heading. @@ -86,7 +85,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks } // Parse the inline content. - result.Inlines = Common.ParseInlineChildren(markdown, pos, end); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, pos, end); return result; } @@ -148,7 +147,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks result.HeaderLevel = underlineChar == '=' ? 1 : 2; // Parse the inline content. - result.Inlines = Common.ParseInlineChildren(markdown, firstLineStart, firstLineEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, firstLineStart, firstLineEnd); return result; } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs index 79ab4f5d5..11f5abbb2 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Parsers.Core; +using CommunityToolkit.Common.Parsers.Core; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a horizontal line. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs index 6ba7ab729..3a0bcd917 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents the target of a reference ([ref][]). diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs index 1f2cb78b1..bc7d1b1ab 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// This specifies the Content of the List element. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs index df741bc5c..4fd1d14ed 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs @@ -5,7 +5,7 @@ using System; using System.Text; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { [Obsolete(Constants.ParserObsoleteMsg)] internal class ListItemBuilder : MarkdownBlock diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs index c487d3599..c1d3c99b9 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { [Obsolete(Constants.ParserObsoleteMsg)] internal class ListItemPreamble diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs index 8a905d07a..47b2ea7c7 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { [Obsolete(Constants.ParserObsoleteMsg)] internal class NestedListInfo diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs index 03fe6d6ca..25273d969 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs @@ -8,12 +8,11 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Text; using System.Text.RegularExpressions; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; [assembly: InternalsVisibleTo("UnitTests.UWP, PublicKey=002400000480000094000000060200000024000052534131000400000100010041753af735ae6140c9508567666c51c6ab929806adb0d210694b30ab142a060237bc741f9682e7d8d4310364b4bba4ee89cc9d3d5ce7e5583587e8ea44dca09977996582875e71fb54fa7b170798d853d5d8010b07219633bdb761d01ac924da44576d6180cdceae537973982bb461c541541d58417a3794e34f45e6f2d129e2")] -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a list, with each list item proceeded by either a number or a bullet. @@ -57,7 +56,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks ListItemBlock currentListItem = null; actualEnd = start; - foreach (var lineInfo in Common.ParseLines(markdown, start, maxEnd, quoteDepth)) + foreach (var lineInfo in Helpers.Common.ParseLines(markdown, start, maxEnd, quoteDepth)) { // Is this line blank? if (lineInfo.IsLineBlank) @@ -349,7 +348,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks { // Don't allow blocks. var paragraph = new ParagraphBlock(); - paragraph.Inlines = Common.ParseInlineChildren(blockText, 0, blockText.Length); + paragraph.Inlines = Helpers.Common.ParseInlineChildren(blockText, 0, blockText.Length); newBlockList.Add(paragraph); } } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs index 5860c8a71..6fde12ace 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a block of text that is displayed as a single paragraph. @@ -36,7 +35,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks internal static ParagraphBlock Parse(string markdown) { var result = new ParagraphBlock(); - result.Inlines = Common.ParseInlineChildren(markdown, 0, markdown.Length); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, 0, markdown.Length); return result; } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs index 3226293d8..b19d8e966 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a block that is displayed using a quote style. Quotes are used to indicate diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs index 7af169a43..84146cb3b 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs @@ -4,11 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Represents a block which contains tabular data. @@ -198,7 +197,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks internal static int ParseContents(string markdown, int startingPos, int maxEndingPos, int quoteDepth, bool requireVerticalBar, Action contentParser) { // Skip quote characters. - int pos = Common.SkipQuoteCharacters(markdown, startingPos, maxEndingPos, quoteDepth); + int pos = Helpers.Common.SkipQuoteCharacters(markdown, startingPos, maxEndingPos, quoteDepth); // If the line starts with a '|' character, skip it. bool lineHasVerticalBar = false; @@ -310,7 +309,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks contentParser: (startingPos2, maxEndingPos2) => { var cell = new TableCell(); - cell.Inlines = Common.ParseInlineChildren(markdown, startingPos2, maxEndingPos2); + cell.Inlines = Helpers.Common.ParseInlineChildren(markdown, startingPos2, maxEndingPos2); Cells.Add(cell); }); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs index 3f78a0c98..4fd29beed 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// Yaml Header. use for blog. @@ -56,7 +55,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks return null; } - int startUnderlineIndex = Common.FindNextSingleNewLine(markdown, lineStart, end, out int startOfNextLine); + int startUnderlineIndex = Helpers.Common.FindNextSingleNewLine(markdown, lineStart, end, out int startOfNextLine); if (startUnderlineIndex - lineStart != 3) { return null; @@ -70,7 +69,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Blocks List elements = new List(); while (pos < end) { - int nextUnderLineIndex = Common.FindNextSingleNewLine(markdown, pos, end, out startOfNextLine); + int nextUnderLineIndex = Helpers.Common.FindNextSingleNewLine(markdown, pos, end, out startOfNextLine); bool haveSeparator = markdown.Substring(pos, nextUnderLineIndex - pos).Contains(": "); if (haveSeparator) { diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs index f410c803b..e1e79c5f7 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// The alignment of content in a table column. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs index e7158f926..b0090ac1f 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// Specifies the type of Hyperlink that is used. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs index aa12246cb..c03d1507c 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { [Obsolete(Constants.ParserObsoleteMsg)] internal enum InlineParseMethod diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs index 4ed625b78..99f6535f6 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// This specifies the type of style the List will be. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs index 4fbf4f74e..8f18fb6a9 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// Determines the type of Block the Block element is. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs index e377d025a..9cdd05a90 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// Determines the type of Inline the Inline Element is. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs index 0f594a9fa..a385c3b40 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Helpers +namespace CommunityToolkit.Common.Parsers.Markdown.Helpers { /// /// Helpers for Markdown. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs index 06afba36a..fb74cca7c 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; -namespace CommunityToolkit.Net.Parsers.Markdown.Helpers +namespace CommunityToolkit.Common.Parsers.Markdown.Helpers { /// /// Reports an error during debugging. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs index 9cce864ef..c198462fe 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Helpers +namespace CommunityToolkit.Common.Parsers.Markdown.Helpers { /// /// Represents the result of parsing an inline element. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs index d45d9e55c..d93aa5dfb 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Helpers +namespace CommunityToolkit.Common.Parsers.Markdown.Helpers { /// /// A helper class for the trip chars. This is an optimization. If we ask each class to go diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs index 37739abb4..94f1d5622 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Helpers +namespace CommunityToolkit.Common.Parsers.Markdown.Helpers { [Obsolete(Constants.ParserObsoleteMsg)] internal class LineInfo diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs index 9034b80f5..05a293863 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing bold italic text. @@ -66,7 +66,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. The end sequence (either '***' or '___') must be the same // as the start sequence. var innerStart = start + 3; - int innerEnd = Common.IndexOf(markdown, startSequence, innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, startSequence, innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -97,7 +97,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines { new ItalicTextInline { - Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd) + Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd) } } }; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs index ffee6c3ba..d3f983ecc 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span that contains bold text. @@ -61,7 +61,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. The end sequence (either '**' or '__') must be the same // as the start sequence. var innerStart = start + 2; - int innerEnd = Common.IndexOf(markdown, startSequence, innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, startSequence, innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -87,7 +87,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! var result = new BoldTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, innerEnd + 2); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs index a75a3cd35..738aafc78 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing code, or other text that is to be displayed using a @@ -61,7 +61,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines innerStart++; // Find the end of the span. - innerEnd = Common.IndexOf(markdown, "``", innerStart, maxEnd); + innerEnd = Helpers.Common.IndexOf(markdown, "``", innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -74,7 +74,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Standard single backtick syntax. // Find the end of the span. - innerEnd = Common.IndexOf(markdown, '`', innerStart, maxEnd); + innerEnd = Helpers.Common.IndexOf(markdown, '`', innerStart, maxEnd); if (innerEnd == -1) { return null; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs index 86345a0c7..0b3a5b46e 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span that contains comment. @@ -57,7 +57,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. The end sequence ('-->') var innerStart = start + 4; - int innerEnd = Common.IndexOf(markdown, "-->", innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, "-->", innerStart, maxEnd); if (innerEnd == -1) { return null; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs index d633f5c2f..927be03a1 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing emoji symbol. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs index 40f155b31..14faf138f 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing emoji symbol. @@ -47,7 +47,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. var innerStart = start + 1; - int innerEnd = Common.IndexOf(markdown, startSequence, innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, startSequence, innerStart, maxEnd); if (innerEnd == -1) { return null; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs index f6817d7a8..634f360a8 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a type of hyperlink where the text and the target URL cannot be controlled diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs index 7bd16fa6f..f0a307ee9 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Initializes a new instance of the class. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs index 2c6ecade4..8c3a8b370 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Initializes a new instance of the class. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs index b25eaab34..cfd288f2e 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Implemented by all inline link elements. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs index 776c68446..1b6dcacd1 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents an embedded image. @@ -223,7 +223,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines } // The reference was found. Check the URL is valid. - if (!Common.IsUrlValid(reference.Url)) + if (!Helpers.Common.IsUrlValid(reference.Url)) { return; } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs index 72d5672f4..de5796461 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing italic text. @@ -56,7 +56,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. The end character (either '*' or '_') must be the same as // the start character. var innerStart = start + 1; - int innerEnd = Common.IndexOf(markdown, startChar, start + 1, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, startChar, start + 1, maxEnd); if (innerEnd == -1) { return null; @@ -82,7 +82,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! var result = new ItalicTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, innerEnd + 1); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs index a77ef5a68..fbbe2c0e5 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Xml.Linq; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span that contains a reference for links to point to. @@ -61,11 +61,11 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. The end sequence ('-->') var innerStart = start + 2; - int innerEnd = Common.IndexOf(markdown, "", innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, "", innerStart, maxEnd); int trueEnd = innerEnd + 4; if (innerEnd == -1) { - innerEnd = Common.IndexOf(markdown, "/>", innerStart, maxEnd); + innerEnd = Helpers.Common.IndexOf(markdown, "/>", innerStart, maxEnd); trueEnd = innerEnd + 2; if (innerEnd == -1) { @@ -74,7 +74,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines } // This link Reference wasn't closed properly if the next link starts before a close. - var nextLink = Common.IndexOf(markdown, " -1 && nextLink < innerEnd) { return null; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs index af7b30301..8a3458ca2 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a type of hyperlink where the text can be different from the target URL. @@ -168,7 +168,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines string url; string tooltip = null; bool lastUrlCharIsDoubleQuote = markdown[linkClose - 1] == '"'; - int tooltipStart = Common.IndexOf(markdown, " \"", linkOpen, linkClose - 1); + int tooltipStart = Helpers.Common.IndexOf(markdown, " \"", linkOpen, linkClose - 1); if (tooltipStart == linkOpen) { return null; @@ -189,7 +189,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Check the URL is okay. if (!url.IsEmail()) { - if (!Common.IsUrlValid(url)) + if (!Helpers.Common.IsUrlValid(url)) { return null; } @@ -201,7 +201,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found a regular stand-alone link. var result = new MarkdownLinkInline(); - result.Inlines = Common.ParseInlineChildren(markdown, linkTextOpen, linkTextClose, ignoreLinks: true); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, linkTextOpen, linkTextClose, ignoreLinks: true); result.Url = url.Replace(" ", "%20"); result.Tooltip = tooltip; return new InlineParseResult(result, start, end); @@ -209,7 +209,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines else if (markdown[pos] == '[') { // Find the ']' character. - int linkClose = Common.IndexOf(markdown, ']', pos + 1, maxEnd); + int linkClose = Helpers.Common.IndexOf(markdown, ']', pos + 1, maxEnd); if (linkClose == -1) { return null; @@ -217,7 +217,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found a reference-style link. var result = new MarkdownLinkInline(); - result.Inlines = Common.ParseInlineChildren(markdown, linkTextOpen, linkTextClose, ignoreLinks: true); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, linkTextOpen, linkTextClose, ignoreLinks: true); result.ReferenceId = markdown.Substring(linkOpen + 1, linkClose - (linkOpen + 1)); if (result.ReferenceId == string.Empty) { @@ -254,7 +254,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines } // The reference was found. Check the URL is valid. - if (!Common.IsUrlValid(reference.Url)) + if (!Helpers.Common.IsUrlValid(reference.Url)) { return; } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs index b46204b7a..ef341be38 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing strikethrough text. @@ -53,7 +53,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // Find the end of the span. var innerStart = start + 2; - int innerEnd = Common.IndexOf(markdown, "~~", innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, "~~", innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -79,7 +79,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! var result = new StrikethroughTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, innerEnd + 2); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs index 89c5fd96b..5f3fe8cf8 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Text; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing subscript text. @@ -59,7 +59,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines } int innerStart = start + 5; - int innerEnd = Common.IndexOf(markdown, "", innerStart, maxEnd); + int innerEnd = Helpers.Common.IndexOf(markdown, "", innerStart, maxEnd); // if don't have the end character or no character between start and end if (innerEnd == -1 || innerEnd == innerStart) @@ -75,7 +75,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! var result = new SubscriptTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, innerEnd + 6); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs index b2303e363..7776cd29c 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown.Helpers; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing superscript text. @@ -73,7 +73,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines { int innerStart = start + 5; int innerEnd, end; - innerEnd = Common.IndexOf(markdown, "", innerStart, maxEnd); + innerEnd = Helpers.Common.IndexOf(markdown, "", innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -92,7 +92,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! end = innerEnd + 6; var result = new SuperscriptTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, end); } else @@ -104,7 +104,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines { // Find the end parenthesis. innerStart++; - innerEnd = Common.IndexOf(markdown, ')', innerStart, maxEnd); + innerEnd = Helpers.Common.IndexOf(markdown, ')', innerStart, maxEnd); if (innerEnd == -1) { return null; @@ -115,7 +115,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines else { // Search for the next whitespace character. - innerEnd = Common.FindNextWhiteSpace(markdown, innerStart, maxEnd, ifNotFoundReturnLength: true); + innerEnd = Helpers.Common.FindNextWhiteSpace(markdown, innerStart, maxEnd, ifNotFoundReturnLength: true); if (innerEnd == innerStart) { // No match if the character after the caret is a space. @@ -127,7 +127,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown.Inlines // We found something! var result = new SuperscriptTextInline(); - result.Inlines = Common.ParseInlineChildren(markdown, innerStart, innerEnd); + result.Inlines = Helpers.Common.ParseInlineChildren(markdown, innerStart, innerEnd); return new InlineParseResult(result, start, end); } } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs index 0c783437b..d1e498107 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// Represents a span containing plain text. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs index b8b877e40..af9bac8d6 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Blocks +namespace CommunityToolkit.Common.Parsers.Markdown.Blocks { /// /// A Block Element is an element that is a container for other structures. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs index 7e4002981..067014a2f 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs @@ -6,10 +6,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Helpers; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// Represents a Markdown Document. @@ -170,7 +169,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown lastIndentation = lastLine.Count(c => c == '>'); } - var currentEndOfLine = Common.FindNextSingleNewLine(markdown, nonSpacePos, end, out _); + var currentEndOfLine = Helpers.Common.FindNextSingleNewLine(markdown, nonSpacePos, end, out _); var currentLine = markdown.Substring(realStartOfLine, currentEndOfLine - realStartOfLine); var currentIndentation = currentLine.Count(c => c == '>'); var firstChar = markdown[realStartOfLine]; @@ -204,7 +203,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown } // Find the end of the current line. - int endOfLine = Common.FindNextSingleNewLine(markdown, nonSpacePos, end, out int startOfNextLine); + int endOfLine = Helpers.Common.FindNextSingleNewLine(markdown, nonSpacePos, end, out int startOfNextLine); if (nonSpaceChar == '\0') { @@ -233,7 +232,7 @@ namespace CommunityToolkit.Net.Parsers.Markdown { realStartOfLine = startOfLine; endOfLine = startOfLine + 3; - startOfNextLine = Common.FindNextSingleNewLine(markdown, startOfLine, end, out startOfNextLine); + startOfNextLine = Helpers.Common.FindNextSingleNewLine(markdown, startOfLine, end, out startOfNextLine); paragraphText.Clear(); } diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs index 0b3162bda..7f947f0ae 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown +namespace CommunityToolkit.Common.Parsers.Markdown { /// /// This is a class used as the base class of all markdown elements. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs index 753da9587..c3ff9e9fa 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs @@ -4,7 +4,7 @@ using System; -namespace CommunityToolkit.Net.Parsers.Markdown.Inlines +namespace CommunityToolkit.Common.Parsers.Markdown.Inlines { /// /// An internal class that is the base class for all inline elements. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.cs index f85bb0f6c..d511dffe5 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.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.Net.Parsers.Markdown.Render +namespace CommunityToolkit.Common.Parsers.Markdown.Render { /// /// Helper for holding persistent state of Renderer. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs index f4ef4e2af..34dc53a1d 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs @@ -2,9 +2,9 @@ // 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.Net.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; -namespace CommunityToolkit.Net.Parsers.Markdown.Render +namespace CommunityToolkit.Common.Parsers.Markdown.Render { /// /// Block Rendering Methods. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs index e327ce186..74a16deef 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs @@ -2,9 +2,9 @@ // 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.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Render +namespace CommunityToolkit.Common.Parsers.Markdown.Render { /// /// Inline Rendering Methods. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs index 748d13910..7ebf972dd 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Text; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; -namespace CommunityToolkit.Net.Parsers.Markdown.Render +namespace CommunityToolkit.Common.Parsers.Markdown.Render { /// /// A base renderer for Rendering Markdown into Controls. diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/InlineRenderContext.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/InlineRenderContext.cs index 2854ff67c..624603d17 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/InlineRenderContext.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/InlineRenderContext.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.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Xaml.Documents; namespace CommunityToolkit.WinUI.UI.Controls.Markdown.Render diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs index a5d364a9a..3312f1d29 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Text; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs index 321093c0f..6c23ef703 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Text; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; -using CommunityToolkit.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Text; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.cs index 61da1e4a2..aaf98f342 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/MarkdownRenderer.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Parsers.Core; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; -using CommunityToolkit.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Core; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/RenderContext.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/RenderContext.cs index fe95b2482..26d1da48b 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/RenderContext.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/RenderContext.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.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Xaml.Media; namespace CommunityToolkit.WinUI.UI.Controls.Markdown.Render diff --git a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.cs b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.cs index 75f6f4df7..631e18045 100644 --- a/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.cs +++ b/CommunityToolkit.WinUI.UI.Controls.Markdown/Render/UIElementCollectionRenderContext.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.Net.Parsers.Markdown.Render; +using CommunityToolkit.Common.Parsers.Markdown.Render; using Microsoft.UI.Xaml.Controls; namespace CommunityToolkit.WinUI.UI.Controls.Markdown.Render diff --git a/CommunityToolkit.WinUI.UI/Converters/FileSizeToFriendlyStringConverter.cs b/CommunityToolkit.WinUI.UI/Converters/FileSizeToFriendlyStringConverter.cs index d3dcd3ab4..fb63b59b0 100644 --- a/CommunityToolkit.WinUI.UI/Converters/FileSizeToFriendlyStringConverter.cs +++ b/CommunityToolkit.WinUI.UI/Converters/FileSizeToFriendlyStringConverter.cs @@ -17,7 +17,7 @@ namespace CommunityToolkit.WinUI.UI.Converters { if (value is long size) { - return Net.Converters.ToFileSizeString(size); + return Common.Converters.ToFileSizeString(size); } return string.Empty; diff --git a/CommunityToolkit.WinUI.UI/Converters/TaskResultConverter.cs b/CommunityToolkit.WinUI.UI/Converters/TaskResultConverter.cs index 7445b576e..c02c78040 100644 --- a/CommunityToolkit.WinUI.UI/Converters/TaskResultConverter.cs +++ b/CommunityToolkit.WinUI.UI/Converters/TaskResultConverter.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using Microsoft.UI.Xaml.Data; namespace CommunityToolkit.WinUI.UI.Converters diff --git a/CommunityToolkit.WinUI.UI/Extensions/TextBox/TextBoxExtensions.Regex.Internals.cs b/CommunityToolkit.WinUI.UI/Extensions/TextBox/TextBoxExtensions.Regex.Internals.cs index b12a2da3a..d7b5075da 100644 --- a/CommunityToolkit.WinUI.UI/Extensions/TextBox/TextBoxExtensions.Regex.Internals.cs +++ b/CommunityToolkit.WinUI.UI/Extensions/TextBox/TextBoxExtensions.Regex.Internals.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Text.RegularExpressions; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj b/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj index 382a19590..32881a426 100644 --- a/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj +++ b/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj @@ -10,7 +10,7 @@ - + diff --git a/CommunityToolkit.WinUI/Extensions/TypedEventHandlerExtensions.cs b/CommunityToolkit.WinUI/Extensions/TypedEventHandlerExtensions.cs index 8d82cf656..1c11be37d 100644 --- a/CommunityToolkit.WinUI/Extensions/TypedEventHandlerExtensions.cs +++ b/CommunityToolkit.WinUI/Extensions/TypedEventHandlerExtensions.cs @@ -6,7 +6,7 @@ using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using CommunityToolkit.Net.Deferred; +using CommunityToolkit.Common.Deferred; using Windows.Foundation; namespace CommunityToolkit.WinUI.Deferred diff --git a/CommunityToolkit.WinUI/IncrementalLoadingCollection/IncrementalLoadingCollection.cs b/CommunityToolkit.WinUI/IncrementalLoadingCollection/IncrementalLoadingCollection.cs index c792215b1..0af5ed468 100644 --- a/CommunityToolkit.WinUI/IncrementalLoadingCollection/IncrementalLoadingCollection.cs +++ b/CommunityToolkit.WinUI/IncrementalLoadingCollection/IncrementalLoadingCollection.cs @@ -9,7 +9,7 @@ using System.ComponentModel; using System.Linq; using System.Threading; using System.Threading.Tasks; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using Microsoft.UI.Xaml.Data; using Windows.Foundation; diff --git a/Directory.Build.props b/Directory.Build.props index cc91df6b3..e4e8f76c8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - CommunityToolkit.Net + CommunityToolkit.Common true true https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png diff --git a/SmokeTests/CommunityToolkit.Common/MainPage.xaml.cs b/SmokeTests/CommunityToolkit.Common/MainPage.xaml.cs index 5689639c5..f58fab26f 100644 --- a/SmokeTests/CommunityToolkit.Common/MainPage.xaml.cs +++ b/SmokeTests/CommunityToolkit.Common/MainPage.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.Net; +using CommunityToolkit.Common; namespace SmokeTest { diff --git a/SmokeTests/CommunityToolkit.Diagnostics/MainPage.xaml.cs b/SmokeTests/CommunityToolkit.Diagnostics/MainPage.xaml.cs index acbfb18c8..20dc6f0dd 100644 --- a/SmokeTests/CommunityToolkit.Diagnostics/MainPage.xaml.cs +++ b/SmokeTests/CommunityToolkit.Diagnostics/MainPage.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.Net.Diagnostics; +using CommunityToolkit.Diagnostics; namespace SmokeTest { diff --git a/SmokeTests/CommunityToolkit.HighPerformance/MainPage.xaml.cs b/SmokeTests/CommunityToolkit.HighPerformance/MainPage.xaml.cs index 5a636b72c..424805e4d 100644 --- a/SmokeTests/CommunityToolkit.HighPerformance/MainPage.xaml.cs +++ b/SmokeTests/CommunityToolkit.HighPerformance/MainPage.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.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; namespace SmokeTest { diff --git a/SmokeTests/CommunityToolkit.Mvvm/MainPage.xaml.cs b/SmokeTests/CommunityToolkit.Mvvm/MainPage.xaml.cs index 93bf07a53..8a4a1f692 100644 --- a/SmokeTests/CommunityToolkit.Mvvm/MainPage.xaml.cs +++ b/SmokeTests/CommunityToolkit.Mvvm/MainPage.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.Net.Mvvm.Input; +using CommunityToolkit.Common.Mvvm.Input; namespace SmokeTest { diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index f2c3a2404..3d37eddd7 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -7,10 +7,10 @@ UWPBaseline; UWPBaselineWinUI; - CommunityToolkit.Net; - CommunityToolkit.Net.Diagnostics; - CommunityToolkit.Net.HighPerformance; - CommunityToolkit.Net.Mvvm; + CommunityToolkit.Common; + CommunityToolkit.Diagnostics; + CommunityToolkit.HighPerformance; + CommunityToolkit.Mvvm; CommunityToolkit.WinUI; CommunityToolkit.WinUI.Connectivity; CommunityToolkit.WinUI.DeveloperTools; diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 5fb52ad15..7a1046c01 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -5,9 +5,9 @@ Do Not Translate or Localize This project incorporates components from the projects listed below. The original copyright notices and the licenses under which the .NET Foundation received such components are set forth below. The .NET Foundation reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise. -1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Net/Deferred. +1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Common/Deferred. 2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0. -3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Net.Mvvm` package take inspiration from. +3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Mvvm` package take inspiration from. 4. PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests. 5. QuinnDamerell/UniversalMarkdown (https://github.com/QuinnDamerell/UniversalMarkdown) contributed by Quinn Damerell and Paul Bartrum for the MarkdownTextBlock control, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/772. 6. qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), contributed by Matteo Pagani to identify if running with identity in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/3457. diff --git a/UITests/UITests.App/App.AppService.xaml.cs b/UITests/UITests.App/App.AppService.xaml.cs index 60e9c1ad2..6ac152047 100644 --- a/UITests/UITests.App/App.AppService.xaml.cs +++ b/UITests/UITests.App/App.AppService.xaml.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -using CommunityToolkit.Net.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging; using UITests.App.Pages; using Windows.ApplicationModel.Activation; using Windows.ApplicationModel.AppService; diff --git a/UITests/UITests.App/MainTestHost.xaml.cs b/UITests/UITests.App/MainTestHost.xaml.cs index 06811aab0..560f46d86 100644 --- a/UITests/UITests.App/MainTestHost.xaml.cs +++ b/UITests/UITests.App/MainTestHost.xaml.cs @@ -5,7 +5,7 @@ using System; using System.Reflection; using System.Threading.Tasks; -using CommunityToolkit.Net.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.WinUI; using UITests.App.Pages; using Windows.System; diff --git a/UITests/UITests.App/RequestPageMessage.cs b/UITests/UITests.App/RequestPageMessage.cs index f4d1c0590..687b19515 100644 --- a/UITests/UITests.App/RequestPageMessage.cs +++ b/UITests/UITests.App/RequestPageMessage.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.Net.Mvvm.Messaging.Messages; +using CommunityToolkit.Mvvm.Messaging.Messages; namespace UITests.App { diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index fed05c596..5526b51ec 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -178,13 +178,13 @@ - + {7e30d48c-4cd8-47be-b557-10a20391dcc4} - CommunityToolkit.Net.HighPerformance + CommunityToolkit.HighPerformance - + {d82ae6e1-e612-434e-acb2-363ee48738d3} - CommunityToolkit.Net.Mvvm + CommunityToolkit.Mvvm {b1e850ff-dde6-44d5-a830-34250e97a687} @@ -234,9 +234,9 @@ {805f80df-75c6-4c2f-8fd9-b47f6d0df5a3} CommunityToolkit.WinUI - + {6fe128a8-cefa-4a61-a987-ec92de6b538e} - CommunityToolkit.Net + CommunityToolkit.Common diff --git a/UWP Community Toolkit.sln.GhostDoc.xml b/UWP Community Toolkit.sln.GhostDoc.xml index 051caaa8b..8e1fafd46 100644 --- a/UWP Community Toolkit.sln.GhostDoc.xml +++ b/UWP Community Toolkit.sln.GhostDoc.xml @@ -9,8 +9,8 @@ - .\CommunityToolkit.Net.Win32.UI.Controls\GlobalSuppressions.cs - .\CommunityToolkit.Net.Win32.UI.Controls\Interop\Win32\ExternDll.cs + .\CommunityToolkit.Win32.UI.Controls\GlobalSuppressions.cs + .\CommunityToolkit.Win32.UI.Controls\Interop\Win32\ExternDll.cs diff --git a/UnitTests/Extensions/Test_TaskExtensions.cs b/UnitTests/Extensions/Test_TaskExtensions.cs index c534e5329..f9002940b 100644 --- a/UnitTests/Extensions/Test_TaskExtensions.cs +++ b/UnitTests/Extensions/Test_TaskExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj index 10d359857..21ab6b6c6 100644 --- a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj +++ b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj @@ -19,7 +19,7 @@ - + diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs index 0697c1446..ad5ac12ad 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs @@ -7,8 +7,8 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using System.Reflection; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs index 60791aa61..b23d51bd7 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Buffers diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs index 1c42a1c49..24f7460ad 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs index f0b491884..018aa9655 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs index be84b1d7a..f15de9214 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; using System.Text; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; #nullable enable @@ -42,7 +42,7 @@ namespace UnitTests.HighPerformance.Buffers Assert.AreEqual(x, maps.Length); - Type bucketType = Type.GetType("CommunityToolkit.Net.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, CommunityToolkit.Net.HighPerformance")!; + Type bucketType = Type.GetType("CommunityToolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, CommunityToolkit.HighPerformance")!; int[] buckets = (int[])bucketType.GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(maps.GetValue(0))!; @@ -287,7 +287,7 @@ namespace UnitTests.HighPerformance.Buffers // Get the buckets Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(pool)!; - Type bucketType = Type.GetType("CommunityToolkit.Net.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, CommunityToolkit.Net.HighPerformance")!; + Type bucketType = Type.GetType("CommunityToolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, CommunityToolkit.HighPerformance")!; FieldInfo timestampInfo = bucketType.GetField("timestamp", BindingFlags.Instance | BindingFlags.NonPublic)!; // Force the timestamp to be the maximum value, or the test would take too long @@ -305,7 +305,7 @@ namespace UnitTests.HighPerformance.Buffers _ = pool.GetOrAdd(text); - Type heapEntryType = Type.GetType("CommunityToolkit.Net.HighPerformance.Buffers.StringPool+FixedSizePriorityMap+HeapEntry, CommunityToolkit.Net.HighPerformance")!; + Type heapEntryType = Type.GetType("CommunityToolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap+HeapEntry, CommunityToolkit.HighPerformance")!; foreach (var map in maps) { diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs index 3917ab640..4089d3573 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance.Enumerables; +using CommunityToolkit.HighPerformance.Enumerables; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Enumerables diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs index 6dfbba43c..029af214d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance.Enumerables; +using CommunityToolkit.HighPerformance.Enumerables; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Enumerables diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs index 5dae4e550..5246fcf96 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs index 11cd58ee9..a6a188e55 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs @@ -4,8 +4,8 @@ using System; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Enumerables; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Enumerables; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs index 0abba9fe9..185203af4 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs index 41880a195..03a784c23 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Buffers; using System.Linq; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs index 5050ff2dd..2dc03d87a 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs index 3604e0662..e7e8e78e3 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs @@ -5,8 +5,8 @@ using System; using System.Diagnostics.Contracts; using System.Runtime.InteropServices; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs index 24bbcecf4..5fe13994f 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs @@ -8,8 +8,8 @@ using System.Buffers; #endif using System.IO; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs index 30771e9f9..9652856ad 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.IO; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs index bb901fc62..1bc962522 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs @@ -7,7 +7,7 @@ using System.Buffers; using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs index fe53bbb31..8328ea51d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs @@ -5,7 +5,7 @@ #if NET5_0 using System.Numerics; -using CommunityToolkit.Net.HighPerformance.Extensions; +using CommunityToolkit.HighPerformance.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs index 32517fffc..a29138103 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs @@ -4,7 +4,7 @@ using System; using System.IO; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs index f87765861..7fd6167be 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs @@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Linq; using System.Runtime.InteropServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs index 8274545e3..388100122 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs index ceda3106b..3d45dcd5c 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs index 5666f137a..88694e15c 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs index 24f937305..14c4ca786 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs @@ -4,7 +4,7 @@ using System; using System.IO; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs index e4cec2813..4ab2ee34a 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs index 926facb37..cae167ff2 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.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.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Helpers diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs index db2c1f664..a8deab78d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs @@ -6,7 +6,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Runtime.InteropServices; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs index 91d780197..bdc3cdc6d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Extensions diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs index b48347e2e..cf4920749 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs index ac54f551f..580152bc8 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs @@ -4,7 +4,7 @@ using System; using System.Drawing; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs index 893854d5f..57790fa41 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs @@ -6,7 +6,7 @@ using System; using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; using System.Threading; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs index e19e65089..81a9c4fe0 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs @@ -4,8 +4,8 @@ using System; using System.Diagnostics.Contracts; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Helpers diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs index 8ea8d0c10..d426c81ba 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTests.HighPerformance.Shared.Buffers.Internals; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs index 5f85b523f..cf4166d6c 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs @@ -2,8 +2,8 @@ // 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.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Helpers diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs index 6e5e8769f..ba0432cd0 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using CommunityToolkit.Net.HighPerformance.Helpers; +using CommunityToolkit.HighPerformance.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException; diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs index b88fb5e21..6c9b32dae 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs @@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis; #if !WINDOWS_UWP using System.Runtime.CompilerServices; #endif -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance @@ -535,7 +535,7 @@ namespace UnitTests.HighPerformance // Here we just want to verify that the type is nicely printed as expected, along with the size string text = memory2d.ToString(); - const string expected = "CommunityToolkit.Net.HighPerformance.Memory2D[2, 3]"; + const string expected = "CommunityToolkit.HighPerformance.Memory2D[2, 3]"; Assert.AreEqual(text, expected); } diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs index e6377da4b..09768f4da 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs @@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis; #if !WINDOWS_UWP using System.Runtime.CompilerServices; #endif -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance @@ -483,7 +483,7 @@ namespace UnitTests.HighPerformance string text = memory2d.ToString(); - const string expected = "CommunityToolkit.Net.HighPerformance.ReadOnlyMemory2D[2, 3]"; + const string expected = "CommunityToolkit.HighPerformance.ReadOnlyMemory2D[2, 3]"; Assert.AreEqual(text, expected); } diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs index 0c3796387..e3c3d2c15 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs @@ -5,8 +5,8 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Enumerables; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Enumerables; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance @@ -635,7 +635,7 @@ namespace UnitTests.HighPerformance string text = span2d.ToString(); - const string expected = "CommunityToolkit.Net.HighPerformance.ReadOnlySpan2D[2, 3]"; + const string expected = "CommunityToolkit.HighPerformance.ReadOnlySpan2D[2, 3]"; Assert.AreEqual(text, expected); } diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs index 9a21f9f0d..0c91e7053 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs @@ -6,8 +6,8 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Enumerables; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Enumerables; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance @@ -823,7 +823,7 @@ namespace UnitTests.HighPerformance // Verify that we get the nicely formatted string string text = span2d.ToString(); - const string expected = "CommunityToolkit.Net.HighPerformance.Span2D[2, 3]"; + const string expected = "CommunityToolkit.HighPerformance.Span2D[2, 3]"; Assert.AreEqual(text, expected); } diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs index 257daf537..2b5b101db 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs @@ -7,8 +7,8 @@ using System.Buffers; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Threading.Tasks; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Streams diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs index ba629672a..2bf3afea6 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs @@ -4,8 +4,8 @@ using System; using System.IO; -using CommunityToolkit.Net.HighPerformance; -using CommunityToolkit.Net.HighPerformance.Buffers; +using CommunityToolkit.HighPerformance; +using CommunityToolkit.HighPerformance.Buffers; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Streams diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs index fdf796181..744c1f5e0 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Linq; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Streams diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs index f0da3d9eb..b1eed96c0 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs @@ -8,7 +8,7 @@ using System.Diagnostics.Contracts; using System.IO; using System.Runtime.InteropServices; using System.Threading.Tasks; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance.Streams diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs index fdba6b285..a1983f80d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs index cf5929452..7091b8d3c 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs @@ -7,7 +7,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs index b81098f7a..c0d15881d 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs @@ -7,7 +7,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs index e796f346d..02a9851af 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs index 09e7fa3d0..030fc7e54 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs +++ b/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using CommunityToolkit.Net.HighPerformance; +using CommunityToolkit.HighPerformance; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.HighPerformance diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj index 60851cfd6..17ef52b2e 100644 --- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj +++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj @@ -164,9 +164,9 @@ - + {7e30d48c-4cd8-47be-b557-10a20391dcc4} - CommunityToolkit.Net.HighPerformance + CommunityToolkit.HighPerformance diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj index 94f5189d3..18c24207f 100644 --- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj +++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs index b7d9c3dbd..7db5bfe61 100644 --- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs +++ b/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs @@ -4,7 +4,7 @@ using System.Collections.Specialized; using System.Linq; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using FluentAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs index bfa66f249..345873883 100644 --- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs +++ b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs @@ -4,7 +4,7 @@ using System; using System.Linq; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using FluentAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs index 234814aaa..34cafe002 100644 --- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs +++ b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using FluentAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs index 561d4bc95..2b02dfae2 100644 --- a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs +++ b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using FluentAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs index fb4f3ae22..83d25e00b 100644 --- a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs +++ b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs @@ -9,7 +9,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; using System.Linq; -using CommunityToolkit.Net.Collections; +using CommunityToolkit.Common.Collections; using FluentAssertions; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs index 0730590e0..dfa421e2a 100644 --- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs +++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Diagnostics diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs index c5f17adc4..8e6e04ece 100644 --- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs +++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Diagnostics diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs index 03432e483..56879e507 100644 --- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs +++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Diagnostics diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs index 0e0e226f7..ab96059a6 100644 --- a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs +++ b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; using System.Threading; -using CommunityToolkit.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Diagnostics diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs index 09c903081..9e6fd1a30 100644 --- a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs +++ b/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Linq; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs index d48061fe5..7db0ec5e1 100644 --- a/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs +++ b/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -using CommunityToolkit.Net.Deferred; +using CommunityToolkit.Common.Deferred; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs index 6a3921cba..0302a80eb 100644 --- a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs +++ b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs index 3d76ef75a..5d0a07111 100644 --- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs +++ b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs index c8d8fe8d9..bc25d1972 100644 --- a/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs +++ b/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.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.Net.Diagnostics; +using CommunityToolkit.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Extensions diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs index 075c3db75..7cfefd334 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Threading.Tasks; -using CommunityToolkit.Net.Mvvm.Input; +using CommunityToolkit.Mvvm.Input; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs index 8f7970349..46c635b6b 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; -using CommunityToolkit.Net.Mvvm.Input; +using CommunityToolkit.Mvvm.Input; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs index 50e8689b0..98ab261b6 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using CommunityToolkit.Net.Mvvm.Messaging; -using CommunityToolkit.Net.Mvvm.Messaging.Messages; +using CommunityToolkit.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging.Messages; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs index c81052283..0ef1d4097 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs @@ -5,7 +5,7 @@ using System; using System.Linq; using System.Reflection; -using CommunityToolkit.Net.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs index 5d0c060f3..b1cb979ca 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -using CommunityToolkit.Net.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs index 9f72b09b3..be3d6dea6 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Mvvm.ComponentModel; -using CommunityToolkit.Net.Mvvm.Messaging; -using CommunityToolkit.Net.Mvvm.Messaging.Messages; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging.Messages; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs index 6dd340d93..5cce568f7 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs @@ -8,7 +8,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text.RegularExpressions; -using CommunityToolkit.Net.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs index ac91dab07..608710099 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using CommunityToolkit.Net.Mvvm.Input; +using CommunityToolkit.Mvvm.Input; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs index 1790ca09f..c23c47c15 100644 --- a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs +++ b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; -using CommunityToolkit.Net.Mvvm.Input; +using CommunityToolkit.Mvvm.Input; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Mvvm diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs index baafdb3de..756ac4186 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs index 4d1cfec97..dcb8aabeb 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs index a66a954ec..e45429f6a 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs @@ -4,9 +4,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; -using CommunityToolkit.Net.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs index 444e75d6d..554730d4c 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs index fe047ffc9..c46f90e2b 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs index 413e1994b..e41289df3 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs index 2b0b30938..64b7cecd3 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs index 99d0409a4..ba00e6ddf 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs @@ -2,9 +2,9 @@ // 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.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs index a35b104f2..2e5ead7c2 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs @@ -2,9 +2,9 @@ // 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.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs index fe3c6d70c..ded49d11b 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs index cc5bcda60..6a2270681 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs @@ -4,8 +4,8 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Text; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs index 88e1d9c79..733d7e5eb 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs index 644bc1633..648d405d8 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs @@ -4,9 +4,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs index ec6d3104b..8ec4aeeab 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs index 91724981c..6c4881b5e 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs @@ -2,8 +2,8 @@ // 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.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace UnitTests.Markdown.Parse diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs index 6a7347d3f..7c5e9c775 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.VisualStudio.TestTools.UnitTesting; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs index f68019706..199b2efc9 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs @@ -4,9 +4,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; -using CommunityToolkit.Net.Parsers.Markdown; -using CommunityToolkit.Net.Parsers.Markdown.Blocks; -using CommunityToolkit.Net.Parsers.Markdown.Inlines; +using CommunityToolkit.Common.Parsers.Markdown; +using CommunityToolkit.Common.Parsers.Markdown.Blocks; +using CommunityToolkit.Common.Parsers.Markdown.Inlines; namespace UnitTests.Markdown.Parse { diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs index e9a68c291..a72ce8f87 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.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.Net; +using CommunityToolkit.Common; using CommunityToolkit.WinUI.UI.Controls; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs index dfa7056fb..e7e8de3c5 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using CommunityToolkit.Net; +using CommunityToolkit.Common; using CommunityToolkit.WinUI.UI.Controls; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 983e2a5ba..2dc1b5589 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -166,13 +166,13 @@ - + {76f89522-ca28-458d-801d-947ab033a758} - CommunityToolkit.Net.Diagnostics + CommunityToolkit.Diagnostics - + {d82ae6e1-e612-434e-acb2-363ee48738d3} - CommunityToolkit.Net.Mvvm + CommunityToolkit.Mvvm {b1e850ff-dde6-44d5-a830-34250e97a687} @@ -218,9 +218,9 @@ {805f80df-75c6-4c2f-8fd9-b47f6d0df5a3} CommunityToolkit.WinUI - + {6fe128a8-cefa-4a61-a987-ec92de6b538e} - CommunityToolkit.Net + CommunityToolkit.Common diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml b/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml index 9f6ff7e01..5cfd7dd52 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml @@ -2,7 +2,7 @@ x:Class="UnitTests.XamlIslands.UWPApp.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:xaml="using:CommunityToolkit.Net.Win32.UI.XamlHost" + xmlns:xaml="using:CommunityToolkit.Win32.UI.XamlHost" RequestedTheme="Light"> diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml.cs index 12613cd39..29cc97455 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml.cs +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/App.xaml.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.System; -using CommunityToolkit.Net.Win32.UI.XamlHost; +using CommunityToolkit.Win32.UI.XamlHost; using Microsoft.UI.Xaml; namespace UnitTests.XamlIslands.UWPApp diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 489531200..d1ef0a151 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -169,7 +169,7 @@ 6.2.12 - + 6.1.2