From 118f6ebb81aec1c54ef4784b7a0260dbcf193221 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Mar 2021 09:09:28 +0530
Subject: [PATCH 1/3] The "MarkdownTextBlock" control is now present in the
 Toolbox

The MarkdownTextBlock's Assembly entry in the VS manifest is wrong, which is why the control was not present in the Toolbox.
By simply updating to the correct Assembly Name lets the "MarkdownTextBlock" control to be validated and listed in the Visual Studio Toolbox.
---
 .../VisualStudioToolsManifest.xml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
index ce34feb76a6..1fadcce11ff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
@@ -1,5 +1,5 @@
 <FileList>
-  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock.dll">
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Markdown.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
     </ToolboxItems>

From 41613a482c337943ec1fe5078e33dea21799e1b0 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Mar 2021 09:15:49 +0530
Subject: [PATCH 2/3] Add missing controls to the Toolbox

There are many controls that were added since the original Design project was authored.
Some of them were not added due to lack of docs w.r.t the Design project.
So, We'll add them here and now instead.

NOTE: If this works properly, then, we'll backport these changes to older versions.
---
 .../VisualStudioToolsManifest.xml               |  1 +
 .../VisualStudioToolsManifest.xml               | 17 +++++++++++++++++
 .../VisualStudioToolsManifest.xml               |  6 ++++++
 .../VisualStudioToolsManifest.xml               |  1 +
 .../VisualStudioToolsManifest.xml               |  3 +++
 .../VisualStudioToolsManifest.xml               |  2 ++
 6 files changed, 30 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 161131ea6dd..77c729143a5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -13,6 +13,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabbedCommandBar" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabbedCommandBarItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
     </ToolboxItems>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
index 761934998a6..00f0341a283 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
@@ -2,6 +2,23 @@
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCell" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCellsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridBoundColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridFillerColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCheckBoxColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridComboBoxColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumnHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumnHeadersPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridDetailsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridFrozenGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRow" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowGroupHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridTemplateColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridTextColumn" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
index c6f210468c2..d49b8fd2eb3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
@@ -1,8 +1,14 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Input.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPicker" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButton" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerSlider" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RemoteDevicePicker" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TokenizingTextBox" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TokenizingTextBoxItem" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
index f8ae329c03d..c8c03cc069c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
@@ -4,6 +4,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
index 31b1259a180..48cbc81c449 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -2,8 +2,11 @@
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Media.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.EyedropperToolButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropperThumb" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvasTextBox" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index da08ea53fd9..05cda5964cf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -3,9 +3,11 @@
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredLayout" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.SwitchPresenter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapLayout" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
     </ToolboxItems>
   </File>

From ec5b79efbe20aef051701e21b8a43fc7882fe355 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Mar 2021 09:34:31 +0530
Subject: [PATCH 3/3] Only display controls where UAP is supported

When specified with "UIFramework" tag on the controls, we ensure that the controls doesn't list in places where UWP UI/WinUI is not supported.
---
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 .../VisualStudioToolsManifest.xml                             | 4 +++-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
index 2c51528df63..5b0b0159144 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.DeveloperTools.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.DeveloperTools.AlignmentGrid" />
       <Item Type="Microsoft.Toolkit.Uwp.DeveloperTools.FocusTracker" />
     </ToolboxItems>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 77c729143a5..031faeee520 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
index 00f0341a283..0eef95ce961 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCell" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCellsPresenter" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
index d49b8fd2eb3..4d21f08c983 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Input.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPicker" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerSlider" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
index c8c03cc069c..0e6a134c524 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Layout.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
index 1fadcce11ff..1e886827d3b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Markdown.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
     </ToolboxItems>
   </File>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
index 48cbc81c449..21e6e3e8248 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Media.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.EyedropperToolButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index 05cda5964cf..74a5a2b4a8a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredLayout" />