diff --git a/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj b/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
deleted file mode 100644
index a141b75c84b..00000000000
--- a/Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- netstandard2.0
- Windows Community Toolkit .NET Standard Parsers
-
- This .NET standard library contains various parsers
-
- Markdown: Allows you to parse a Markdown String into a Markdown Document, and then Render it with a Markdown Renderer.
-
-
- UWP Toolkit Windows Parsers Parsing Markdown
-
-
-
-
-
-
-
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
index ecc9cb6cc2a..715a6668d06 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
@@ -25,6 +25,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.Controls
///
internal class SampleAppMarkdownRenderer : MarkdownRenderer
{
+#pragma warning disable CS0618 // Type or member is obsolete
public SampleAppMarkdownRenderer(MarkdownDocument document, ILinkRegister linkRegister, IImageResolver imageResolver, ICodeBlockResolver codeBlockResolver)
: base(document, linkRegister, imageResolver, codeBlockResolver)
{
@@ -514,5 +515,6 @@ private class CustomCodeBlock
public string CurrentLanguage { get; set; }
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index fd32763ecbd..e5d037b0940 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -745,9 +745,6 @@
ListViewExtensionsPage.xaml
-
- MarkdownParserPage.xaml
-
MenuPage.xaml
@@ -1175,10 +1172,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
MSBuild:Compile
Designer
@@ -1401,10 +1394,6 @@
-
- {42CA4935-54BE-42EA-AC19-992378C08DE6}
- Microsoft.Toolkit.Parsers
-
{b1e850ff-dde6-44d5-a830-34250e97a687}
Microsoft.Toolkit.Uwp.Connectivity
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
deleted file mode 100644
index 657d20de2d7..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs
deleted file mode 100644
index c957626067e..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.Toolkit.Parsers.Markdown;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
- ///
- /// An empty page that can be used on its own or navigated to within a Frame.
- ///
- public sealed partial class MarkdownParserPage : Page
- {
- public MarkdownParserPage()
- {
- this.InitializeComponent();
- this.Loaded += MarkdownParserPage_Loaded;
- }
-
- private void MarkdownParserPage_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
- {
- UpdateMDResult();
- }
-
- private void RawMarkdown_TextChanged(object sender, TextChangedEventArgs e)
- {
- UpdateMDResult();
- }
-
- private void UpdateMDResult()
- {
- var document = new MarkdownDocument();
- document.Parse(RawMarkdown.Text);
-
- var jsonSerializerOptions = new JsonSerializerOptions
- {
- WriteIndented = true
- };
- jsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
-
- var json = JsonSerializer.Serialize(document, typeof(MarkdownDocument), jsonSerializerOptions);
- MarkdownResult.Text = json;
- }
- }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 0f94094a2f7..2b5c05458ad 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -857,14 +857,6 @@
"Icon": "/Assets/Helpers.png",
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehavior.md"
},
- {
- "Name": "Markdown Parser",
- "Type": "MarkdownParserPage",
- "Subcategory": "Parser",
- "About": "The Markdown Parser allows you to parse a Markdown String into a Markdown Document, and then Render it with a Markdown Renderer.",
- "Icon": "/Assets/Helpers.png",
- "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/MarkdownParser.md"
- },
{
"Name": "Win2d Path Mini Language Parser",
"Type": "CanvasPathGeometryPage",
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
index 5066137f810..57734e744ce 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.Methods.cs
@@ -63,6 +63,7 @@ private void RenderMarkdown()
try
{
// Try to parse the markdown.
+#pragma warning disable CS0618 // Type or member is obsolete
MarkdownDocument markdown = new MarkdownDocument();
foreach (string str in SchemeList.Split(',').ToList())
{
@@ -71,6 +72,7 @@ private void RenderMarkdown()
MarkdownDocument.KnownSchemes.Add(str);
}
}
+#pragma warning restore CS0618 // Type or member is obsolete
markdown.Parse(Text);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index a16e02bd467..7183ac859ff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -17,24 +17,8 @@
-
-
- True
- True
- Resources.resx
-
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Constants.cs
new file mode 100644
index 00000000000..2754df10e14
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Constants.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Toolkit.Parsers
+{
+ internal static class Constants
+ {
+ internal const string ParserObsoleteMsg = "Parsing code has been deprecated, we suggest using Markdig. See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3200 for more info.";
+ }
+}
diff --git a/Microsoft.Toolkit.Parsers/Core/IParser.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/IParser.cs
similarity index 92%
rename from Microsoft.Toolkit.Parsers/Core/IParser.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/IParser.cs
index 909de123be0..21003d67010 100644
--- a/Microsoft.Toolkit.Parsers/Core/IParser.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/IParser.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
namespace Microsoft.Toolkit.Parsers
@@ -10,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers
/// Parser interface.
///
/// Type to parse into.
+ [Obsolete(Constants.ParserObsoleteMsg)]
public interface IParser
where T : SchemaBase
{
diff --git a/Microsoft.Toolkit.Parsers/Core/ParseHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs
similarity index 95%
rename from Microsoft.Toolkit.Parsers/Core/ParseHelpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs
index e191c5bb7ec..f3528e4efde 100644
--- a/Microsoft.Toolkit.Parsers/Core/ParseHelpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/ParseHelpers.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Core
{
///
/// This class offers helpers for Parsing.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public static class ParseHelpers
{
///
diff --git a/Microsoft.Toolkit.Parsers/Core/SchemaBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs
similarity index 89%
rename from Microsoft.Toolkit.Parsers/Core/SchemaBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs
index f896d5dd463..c3f03103bf7 100644
--- a/Microsoft.Toolkit.Parsers/Core/SchemaBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/SchemaBase.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers
{
///
/// Strong typed schema base class.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public abstract class SchemaBase
{
///
diff --git a/Microsoft.Toolkit.Parsers/Core/StringValueAttribute.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs
similarity index 95%
rename from Microsoft.Toolkit.Parsers/Core/StringValueAttribute.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs
index 551a0340be6..362b423dada 100644
--- a/Microsoft.Toolkit.Parsers/Core/StringValueAttribute.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Core/StringValueAttribute.cs
@@ -10,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Core
/// The StringValue attribute is used as a helper to decorate enum values with string representations.
///
[AttributeUsage(AttributeTargets.Field)]
+ [Obsolete(Constants.ParserObsoleteMsg)]
public sealed class StringValueAttribute : Attribute
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs
index 373d14c2e70..75a8be2e7be 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/CodeBlock.cs
@@ -2,6 +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 System;
using System.Text;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
/// Represents a block of text that is displayed in a fixed-width font. Inline elements and
/// escape sequences are ignored inside the code block.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class CodeBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/HeaderBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/HeaderBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs
index 9a7d6dba5b9..2b2c098892a 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/HeaderBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HeaderBlock.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
/// Single-Line Header CommonMark Spec
/// Two-Line Header CommonMark Spec
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class HeaderBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/HorizontalRuleBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs
similarity index 97%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/HorizontalRuleBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs
index 12a3b487afa..995c291af15 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/HorizontalRuleBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/HorizontalRuleBlock.cs
@@ -2,6 +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 System;
using Microsoft.Toolkit.Parsers.Core;
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
@@ -9,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// Represents a horizontal line.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class HorizontalRuleBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/LinkReferenceBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/LinkReferenceBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs
index 1313650b2cd..ea8a24e167e 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/LinkReferenceBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/LinkReferenceBlock.cs
@@ -2,6 +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 System;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Inlines;
@@ -10,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// Represents the target of a reference ([ref][]).
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class LinkReferenceBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs
similarity index 91%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs
index 49a55d785ac..749b7f5b02a 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBlock.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
@@ -9,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// This specifies the Content of the List element.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class ListItemBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBuilder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs
similarity index 89%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBuilder.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs
index 13d1f61db2a..2ed57718dd1 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemBuilder.cs
@@ -2,10 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
using System.Text;
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
{
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class ListItemBuilder : MarkdownBlock
{
public StringBuilder Builder { get; } = new StringBuilder();
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemPreamble.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs
similarity index 87%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemPreamble.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs
index 6e855917526..0880993998c 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/ListItemPreamble.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/ListItemPreamble.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
{
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class ListItemPreamble
{
public ListStyle Style { get; set; }
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/NestedListInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs
similarity index 88%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/List/NestedListInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs
index d2473bfbafb..c164aed6713 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/List/NestedListInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/List/NestedListInfo.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
{
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class NestedListInfo
{
public ListBlock List { get; set; }
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs
index 631d18c962a..8acf843ff61 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ListBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ListBlock.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// Represents a list, with each list item proceeded by either a number or a bullet.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class ListBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ParagraphBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs
similarity index 96%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/ParagraphBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs
index 9e871124a3b..6083bb44ff0 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/ParagraphBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/ParagraphBlock.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
using Microsoft.Toolkit.Parsers.Markdown.Inlines;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// Represents a block of text that is displayed as a single paragraph.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class ParagraphBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/QuoteBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs
similarity index 97%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/QuoteBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs
index 8b5d712c0ab..a8e0ec690ef 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/QuoteBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/QuoteBlock.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
@@ -10,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
/// Represents a block that is displayed using a quote style. Quotes are used to indicate
/// that the text originated elsewhere (e.g. a previous comment).
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class QuoteBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs
index 0ee728ca766..a3b41f346ae 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/TableBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/TableBlock.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
///
/// Represents a block which contains tabular data.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class TableBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs
index cb815721834..a831e97c434 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Blocks/YamlHeaderBlock.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
/// tag: something
/// ---
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class YamlHeaderBlock : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/ColumnAlignment.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs
similarity index 93%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/ColumnAlignment.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs
index d5bfe087c6d..deb6d6dcd4f 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/ColumnAlignment.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ColumnAlignment.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// The alignment of content in a table column.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public enum ColumnAlignment
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/HyperlinkType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs
similarity index 95%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/HyperlinkType.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs
index 3780f5f3b5f..900ac8e5682 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/HyperlinkType.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/HyperlinkType.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// Specifies the type of Hyperlink that is used.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public enum HyperlinkType
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/InlineParseMethod.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs
similarity index 96%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/InlineParseMethod.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs
index fa9c9838837..71cda73ac20 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/InlineParseMethod.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/InlineParseMethod.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal enum InlineParseMethod
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/ListStyle.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs
similarity index 90%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/ListStyle.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs
index 9797f36feaf..5a76a05e56d 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/ListStyle.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/ListStyle.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// This specifies the type of style the List will be.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public enum ListStyle
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownBlockType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs
similarity index 95%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownBlockType.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs
index 9443cd3e93c..99c016ba399 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownBlockType.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownBlockType.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// Determines the type of Block the Block element is.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public enum MarkdownBlockType
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownInlineType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs
similarity index 96%
rename from Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownInlineType.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs
index 673e1c53263..03e98ffbd51 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Enums/MarkdownInlineType.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Enums/MarkdownInlineType.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// Determines the type of Inline the Inline Element is.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public enum MarkdownInlineType
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs
index 6f76660c1ba..e8625af8045 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/Common.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/Common.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
///
/// Helpers for Markdown.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class Common
{
private static readonly List _triggerList = new List();
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/DebuggingReporter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs
similarity index 92%
rename from Microsoft.Toolkit.Parsers/Markdown/Helpers/DebuggingReporter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs
index 3f1cbcec4a6..346b5120292 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/DebuggingReporter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/DebuggingReporter.cs
@@ -2,6 +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 System;
using System.Diagnostics;
namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
@@ -9,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
///
/// Reports an error during debugging.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class DebuggingReporter
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineParseResult.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs
similarity index 95%
rename from Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineParseResult.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs
index 5e479b0fddd..c67395d0ee0 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineParseResult.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineParseResult.cs
@@ -2,6 +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 System;
using Microsoft.Toolkit.Parsers.Markdown.Inlines;
namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
@@ -9,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
///
/// Represents the result of parsing an inline element.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class InlineParseResult
{
public InlineParseResult(MarkdownInline parsedElement, int start, int end)
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineTripCharHelper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs
similarity index 94%
rename from Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineTripCharHelper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs
index 0fb92ed69d0..ce16ccf56b0 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/InlineTripCharHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/InlineTripCharHelper.cs
@@ -2,6 +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 System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
{
///
@@ -11,6 +13,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
/// possible match. We will go through the range once and look for everyone's trip chars,
/// and if they can make a match from the trip char then we will commit to them.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class InlineTripCharHelper
{
// Note! Everything in first char and suffix should be lower case!
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Helpers/LineInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs
similarity index 91%
rename from Microsoft.Toolkit.Parsers/Markdown/Helpers/LineInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs
index aefa6817a51..4e7a671e9a6 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Helpers/LineInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Helpers/LineInfo.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Helpers
{
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class LineInfo
{
public int StartOfLine { get; set; }
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldItalicTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldItalicTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs
index 1f6a097b05b..590e35fa3eb 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldItalicTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldItalicTextInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing bold italic text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class BoldItalicTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs
index f4b324a05ed..d535c001eae 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/BoldTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/BoldTextInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span that contains bold text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class BoldTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/CodeInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/CodeInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs
index 5cf00392f62..392ee31b135 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/CodeInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CodeInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
/// Represents a span containing code, or other text that is to be displayed using a
/// fixed-width font.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class CodeInline : MarkdownInline, IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/CommentInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/CommentInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs
index 082b862889a..c3ab38b0353 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/CommentInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/CommentInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -10,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span that contains comment.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal class CommentInline : MarkdownInline, IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
similarity index 100%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.EmojiCodes.cs
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs
similarity index 97%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs
index ced06601eb5..3a5ec6934b7 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/EmojiInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/EmojiInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing emoji symbol.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public partial class EmojiInline : MarkdownInline, IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs
index 4297f6e6676..5832da693fa 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/HyperlinkInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/HyperlinkInline.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
/// Represents a type of hyperlink where the text and the target URL cannot be controlled
/// independently.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class HyperlinkInline : MarkdownInline, IInlineLeaf, ILinkElement
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs
similarity index 91%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs
index 6011380d86b..1269f7fb204 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineContainer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineContainer.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
@@ -9,6 +10,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Initializes a new instance of the class.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public interface IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineLeaf.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs
similarity index 90%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineLeaf.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs
index ee13e55d238..dbe74c4d028 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/IInlineLeaf.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/IInlineLeaf.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
{
///
/// Initializes a new instance of the class.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public interface IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ILinkElement.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs
similarity index 93%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/ILinkElement.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs
index 2a2eac2daa4..2fab0907bf9 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ILinkElement.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ILinkElement.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
{
///
/// Implemented by all inline link elements.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
internal interface ILinkElement
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs
index 3b85323045b..e90aacd4edb 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ImageInline.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents an embedded image.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class ImageInline : MarkdownInline, IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ItalicTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/ItalicTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs
index f85890d8cc4..ffbcc6dd116 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/ItalicTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/ItalicTextInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing italic text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class ItalicTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/LinkAnchorInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/LinkAnchorInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs
index 29634727bb0..3c9256872a1 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/LinkAnchorInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/LinkAnchorInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using System.Xml.Linq;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span that contains a reference for links to point to.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class LinkAnchorInline : MarkdownInline
{
internal LinkAnchorInline()
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/MarkdownLinkInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/MarkdownLinkInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs
index dff6a4733cd..dd6a0ba4c5e 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/MarkdownLinkInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a type of hyperlink where the text can be different from the target URL.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class MarkdownLinkInline : MarkdownInline, IInlineContainer, ILinkElement
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/StrikethroughTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/StrikethroughTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs
index f6dac4ec608..19608672a85 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/StrikethroughTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/StrikethroughTextInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing strikethrough text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class StrikethroughTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/SubscriptTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/SubscriptTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs
index 0992d5ab436..7a683573cb8 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/SubscriptTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SubscriptTextInline.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing subscript text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class SubscriptTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/SuperscriptTextInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/SuperscriptTextInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs
index 01026c2d182..248b90fc092 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/SuperscriptTextInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/SuperscriptTextInline.cs
@@ -2,6 +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 System;
using System.Collections.Generic;
using Microsoft.Toolkit.Parsers.Core;
using Microsoft.Toolkit.Parsers.Markdown.Helpers;
@@ -11,6 +12,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing superscript text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class SuperscriptTextInline : MarkdownInline, IInlineContainer
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs
index 06937b1946b..23d9c19ffd6 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Inlines/TextRunInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/TextRunInline.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
///
/// Represents a span containing plain text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class TextRunInline : MarkdownInline, IInlineLeaf
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/MarkdownBlock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs
similarity index 96%
rename from Microsoft.Toolkit.Parsers/Markdown/MarkdownBlock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs
index eb316dd4d9b..c37104d027f 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/MarkdownBlock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownBlock.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
{
///
/// A Block Element is an element that is a container for other structures.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public abstract class MarkdownBlock : MarkdownElement
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs
similarity index 99%
rename from Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs
index ba481207856..551a4e7d904 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownDocument.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown
/// Represents a Markdown Document.
/// Initialize an instance and call to parse the Raw Markdown Text.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public class MarkdownDocument : MarkdownBlock
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/MarkdownElement.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs
similarity index 87%
rename from Microsoft.Toolkit.Parsers/Markdown/MarkdownElement.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs
index d0e1099a4bb..9bcf93adafe 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/MarkdownElement.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownElement.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown
{
///
/// This is a class used as the base class of all markdown elements.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public abstract class MarkdownElement
{
}
diff --git a/Microsoft.Toolkit.Parsers/Markdown/MarkdownInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs
similarity index 93%
rename from Microsoft.Toolkit.Parsers/Markdown/MarkdownInline.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs
index c1739bd7e37..e9d9c449b72 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/MarkdownInline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/MarkdownInline.cs
@@ -2,11 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+
namespace Microsoft.Toolkit.Parsers.Markdown.Inlines
{
///
/// An internal class that is the base class for all inline elements.
///
+ [Obsolete(Constants.ParserObsoleteMsg)]
public abstract class MarkdownInline : MarkdownElement
{
///
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Render/IRenderContext.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.cs
similarity index 100%
rename from Microsoft.Toolkit.Parsers/Markdown/Render/IRenderContext.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/IRenderContext.cs
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs
similarity index 93%
rename from Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs
index 16a8a58f981..b603e92cd12 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Blocks.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Render
///
public partial class MarkdownRendererBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Renders a paragraph element.
///
@@ -50,5 +51,6 @@ public partial class MarkdownRendererBase
/// Renders a table element.
///
protected abstract void RenderTable(TableBlock element, IRenderContext context);
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs
similarity index 97%
rename from Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs
index f57d188cd30..a5ee72558b3 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.Inlines.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Render
///
public partial class MarkdownRendererBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Renders emoji element.
///
@@ -87,5 +88,6 @@ public partial class MarkdownRendererBase
/// The parsed inline element to render.
/// Persistent state.
protected abstract void RenderCodeRun(CodeInline element, IRenderContext context);
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs
similarity index 98%
rename from Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs
index 9472b2dbc0e..ca6f9ab0a92 100644
--- a/Microsoft.Toolkit.Parsers/Markdown/Render/MarkdownRendererBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Render/MarkdownRendererBase.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Toolkit.Parsers.Markdown.Render
///
public abstract partial class MarkdownRendererBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Initializes a new instance of the class.
///
@@ -247,5 +248,6 @@ protected void CheckRenderMarkdownLink(MarkdownLinkInline element, IRenderContex
/// Gets the markdown document that will be rendered.
///
protected MarkdownDocument Document { get; }
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs
index 04f2cd04284..e63c4db518f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Blocks.cs
@@ -20,6 +20,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Render
///
public partial class MarkdownRenderer
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Renders a list of block elements.
///
@@ -480,5 +481,6 @@ protected override void RenderTable(TableBlock element, IRenderContext context)
blockUIElementCollection.Add(table);
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
index d1c50feabb1..c70116e6575 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs
@@ -21,6 +21,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Render
///
public partial class MarkdownRenderer
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Renders emoji element.
///
@@ -581,5 +582,6 @@ protected override void RenderCodeRun(CodeInline element, IRenderContext context
localContext.InlineCollection.Add(inlineUIContainer);
}
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs
index 6e1a5dd2c9b..ba01a601629 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs
@@ -20,6 +20,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Render
///
public partial class MarkdownRenderer : MarkdownRendererBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Initializes a new instance of the class.
///
@@ -221,5 +222,6 @@ private void Preventative_PointerWheelChanged(object sender, Windows.UI.Xaml.Inp
e.Handled = true;
}
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml
deleted file mode 100644
index 66720038a08..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml.cs
deleted file mode 100644
index 353892f6782..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Parsers/MainPage.xaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Toolkit.Parsers.Markdown;
-using Windows.UI.Xaml.Controls;
-
-namespace SmokeTest
-{
- public sealed partial class MainPage
- {
- public MainPage()
- {
- InitializeComponent();
-
- Loaded += MarkdownParserPage_Loaded;
- }
-
- private void MarkdownParserPage_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
- {
- UpdateMDResult();
- }
-
- private void RawMarkdown_TextChanged(object sender, TextChangedEventArgs e)
- {
- UpdateMDResult();
- }
-
- private void UpdateMDResult()
- {
- var document = new MarkdownDocument();
- document.Parse(RawMarkdown.Text);
-
- MarkdownResult.Text = $"Root type is: {document.Type.ToString()}";
- }
- }
-}
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index bc143d4bb2e..f51cd4a75b5 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -10,7 +10,6 @@
Microsoft.Toolkit.Diagnostics;
Microsoft.Toolkit.HighPerformance;
Microsoft.Toolkit.Mvvm;
- Microsoft.Toolkit.Parsers;
Microsoft.Toolkit.Uwp;
Microsoft.Toolkit.Uwp.Connectivity;
Microsoft.Toolkit.Uwp.DeveloperTools;
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index fd87b691af0..0d35d30b5d1 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -186,10 +186,6 @@
{d82ae6e1-e612-434e-acb2-363ee48738d3}
Microsoft.Toolkit.Mvvm
-
- {42ca4935-54be-42ea-ac19-992378c08de6}
- Microsoft.Toolkit.Parsers
-
{b1e850ff-dde6-44d5-a830-34250e97a687}
Microsoft.Toolkit.Uwp.Connectivity
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs
index c7c1d501ef6..b5da5077c40 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/BoldTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class BoldTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Bold_Simple()
@@ -86,5 +87,6 @@ public void Bold_Negative_CannotBeEmpty()
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "before ****** after" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs
index b9a4b7ad242..0cc1ebc12ad 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/CodeTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class CodeTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Code_Inline()
@@ -267,5 +268,6 @@ Even more code
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "before Code More code Even more code after" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs
index fa845a8c1a3..0d3f7d86b69 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HeaderTests.cs
@@ -13,6 +13,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class HeaderTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - block")]
public void Header_1()
@@ -210,5 +211,6 @@ Header 1
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "Header 1 =" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
index 473f631a218..22e6178f00a 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HorizontalRuleTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class HorizontalRuleTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - block")]
public void HorizontalRule_Simple()
@@ -120,5 +121,6 @@ public void HorizontalRule_DoubleLine()
new HorizontalRuleBlock(),
new HorizontalRuleBlock());
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs
index 926309e98ed..9ca38a8589f 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/HyperlinkTests.cs
@@ -12,6 +12,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class HyperlinkTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Hyperlink_Http()
@@ -802,5 +803,6 @@ public void UserLink_Negative_UppercaseWithSlash()
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "/U/quinbd" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs
index 110275a9dd9..0f611d2087c 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ImageInlineTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class ImageInlineTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void ImageInline_WithWidth()
@@ -86,5 +87,6 @@ public void ImageInline_ParseEncodedUrl()
ReferenceId = string.Empty
}));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs
index b8870aef945..257aae998a9 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ItalicTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class ItalicTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Italic_Simple()
@@ -141,5 +142,6 @@ public void Italic_Negative_CannotBeEmpty()
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "before *** after" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs
index c7d5469a226..661fc3e8e3a 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ListTests.cs
@@ -13,6 +13,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class ListTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - block")]
public void BulletedList_SingleLine()
@@ -443,5 +444,6 @@ public void NumberedList_Negative_NoLetters()
AssertEqual("a. List", new ParagraphBlock().AddChildren(
new TextRunInline { Text = "a. List" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs
index 6e9067011eb..a7cd82adb33 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/MarkdownLinkTests.cs
@@ -13,6 +13,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class MarkdownLinkTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void MarkdownLink_WithLabel()
@@ -367,6 +368,7 @@ public void MarkdownLink_Negative_BackTrack()
new TextRunInline { Text = "] " },
new MarkdownLinkInline { Url = "https://www.reddit.com" }.AddChildren(
new TextRunInline { Text = "text" })));
- }
+ }
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
index ad00cde4362..4d09e452f7a 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
@@ -8,6 +8,7 @@
namespace UnitTests.Markdown.Parse
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestClass]
public class ParagraphTests : ParseTestBase
{
@@ -384,5 +385,6 @@ public void Paragraph_Entities()
"μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ϑ ϒ ϖ – — ‘ ’ ‚ “ ” „ † ‡ • … ‰ ′ ″ ‹ › ‾ ⁄ € ℑ ℘ ℜ ™ ℵ ← ↑ → ↓ ↔ ↵ ⇐ " +
"⇑ ⇒ ⇓ ⇔ ∀ ∂ ∃ ∅ ∇ ∈ ∉ ∋ ∏ ∑ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ⌈ ⌉ ⌊ ⌋ 〈 〉 ◊ ♠ ♣ ♥ ♦" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs
index 32ebf23654c..3f3e1b11067 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestBase.cs
@@ -14,6 +14,7 @@ namespace UnitTests.Markdown.Parse
///
public abstract class ParseTestBase : TestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
internal void AssertEqual(string markdown, params MarkdownBlock[] expectedAst)
{
var expected = new StringBuilder();
@@ -33,5 +34,6 @@ internal void AssertEqual(string markdown, params MarkdownBlock[] expectedAst)
Assert.AreEqual(expected.ToString(), actual.ToString());
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs
index 1305d97a556..89480bf36f2 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParseTestExtensionMethods.cs
@@ -15,6 +15,7 @@ namespace UnitTests.Markdown.Parse
///
public static class ParseTestExtensionMethods
{
+#pragma warning disable CS0618 // Type or member is obsolete
///
/// Adds one or more child elements to the given parent object.
///
@@ -75,5 +76,6 @@ private static void AddChild(Func> getter, Action> setter,
}
list.Add(child);
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs
index ad7036559dd..de66a966f91 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs
@@ -13,6 +13,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class QuoteTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - block")]
public void Quote_SingleLine()
@@ -210,5 +211,6 @@ public void Quote_WithList()
new ListItemBlock().AddChildren(new ParagraphBlock().AddChildren(new TextRunInline { Text = "List item 2" })),
new ListItemBlock().AddChildren(new ParagraphBlock().AddChildren(new TextRunInline { Text = "List item 3" })))));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs
index 662e5a70bf0..f68736a2d0e 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/StrikethroughTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class StrikethroughTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Strikethrough_Simple()
@@ -78,5 +79,6 @@ public void Strikethrough_Escape_2()
new StrikethroughTextInline().AddChildren(
new TextRunInline { Text = @"strike\" })));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs
index 4a4a9864cfe..d2ea1027f3b 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/SubscriptTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class SubscriptTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Superscript_Tag()
@@ -37,5 +38,6 @@ public void Superscript_TagWithSup()
new TextRunInline { Text = "tag" })),
new TextRunInline { Text = " create test" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs
index 46be3b91512..d6b59f2e48a 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/SuperscriptTests.cs
@@ -11,6 +11,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class SuperscriptTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - inline")]
public void Superscript_Simple()
@@ -133,5 +134,6 @@ public void Superscript_Negative_WithParentheses_3()
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "paragraphs)" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs
index 7e70c815b9d..342ecdd8fdd 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/TableTests.cs
@@ -13,6 +13,7 @@ namespace UnitTests.Markdown.Parse
[TestClass]
public class TableTests : ParseTestBase
{
+#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
[TestCategory("Parse - block")]
public void Table_Simple()
@@ -278,5 +279,6 @@ Column A | Column B | Column C
new ParagraphBlock().AddChildren(
new TextRunInline { Text = "Column A | Column B | Column C || A1 | B1 | C1" }));
}
+#pragma warning restore CS0618 // Type or member is obsolete
}
}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 19ce0e26f93..e57139a9e21 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -249,10 +249,6 @@
{d82ae6e1-e612-434e-acb2-363ee48738d3}
Microsoft.Toolkit.Mvvm
-
- {42ca4935-54be-42ea-ac19-992378c08de6}
- Microsoft.Toolkit.Parsers
-
{b1e850ff-dde6-44d5-a830-34250e97a687}
Microsoft.Toolkit.Uwp.Connectivity
@@ -269,6 +265,10 @@
{af1be4e9-e2e1-4729-b076-b3725d8e21ee}
Microsoft.Toolkit.Uwp.UI.Controls.Input
+
+ {6fedf199-b052-49dd-8f3e-2a9224998e0f}
+ Microsoft.Toolkit.Uwp.UI.Controls.Markdown
+
{43bd2a36-9e12-4788-80ae-2377e41e6d05}
Microsoft.Toolkit.Uwp.UI.Controls.Media
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index a47203d569d..62c3d5702d3 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -179,10 +179,6 @@
-->
-
- {42ca4935-54be-42ea-ac19-992378c08de6}
- Microsoft.Toolkit.Parsers
-
{5bf75694-798a-43a0-8150-415de195359c}
Microsoft.Toolkit.Uwp.Input.GazeInteraction
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 6cad23bf45e..e25cc6bab07 100644
--- a/Windows Community Toolkit.sln
+++ b/Windows Community Toolkit.sln
@@ -63,8 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
{DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Parsers", "Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj", "{42CA4935-54BE-42EA-AC19-992378C08DE6}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Input.GazeInteraction", "Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj", "{5BF75694-798A-43A0-8150-415DE195359C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}"
@@ -531,26 +529,6 @@ Global
{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.Build.0 = Release|x86
{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.ActiveCfg = Release|x86
{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.Build.0 = Release|x86
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|ARM.Build.0 = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|ARM64.Build.0 = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x64.Build.0 = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Debug|x86.Build.0 = Debug|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|Any CPU.Build.0 = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|ARM.ActiveCfg = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|ARM.Build.0 = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|ARM64.ActiveCfg = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|ARM64.Build.0 = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x64.ActiveCfg = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x64.Build.0 = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.ActiveCfg = Release|Any CPU
- {42CA4935-54BE-42EA-AC19-992378C08DE6}.Release|x86.Build.0 = Release|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU