From c689a513590fabfe36b760363b285a6c0a739a0d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 26 Jan 2021 15:24:27 -0500
Subject: [PATCH 1/9] Use csporj to aggrate controls

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  | 17 ++++++++++++++
 Windows Community Toolkit.sln                 | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
new file mode 100644
index 00000000000..3bbd1ecfeea
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <Title>Windows Community Toolkit Controls</Title>
+    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 59f6693bb00..ac0f68ff067 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -158,6 +158,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -1095,6 +1097,26 @@ Global
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1143,6 +1165,7 @@ Global
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 057f5fa608850f6ef21e501c8675953d04ec65f7 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 26 Jan 2021 16:19:12 -0500
Subject: [PATCH 2/9] WIP: Try to fix erros when using aggregae package

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 3bbd1ecfeea..93182e44aeb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -14,4 +14,20 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
   </ItemGroup>
+  
+  <!--
+    Required workaround for ProjectReference inclusion of the Controls package
+    The UWP project system is including the Controls resources in the pri file because 
+    it doesn't know it'll be an independent package later during packing.
+    Therefore, we need to remove these extra resources in the PRI pipeline so the 
+    Markdown pri file is properly generated and doesn't include duplicate references to Control resources.
+  -->
+  <Target Name="RemoveUnwantedPri" AfterTargets="GetPackagingOutputs">
+    <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
+    <ItemGroup>
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
+    </ItemGroup>
+    <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
+  </Target>
 </Project>

From bb49ce062ef9ed330b8bd041f032a122a845982d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 15:53:21 -0500
Subject: [PATCH 3/9] Controls: remove unwanted pri files.

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 93182e44aeb..268213c7f2c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -26,7 +26,17 @@
     <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
     <ItemGroup>
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Primitives.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Media.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
     </ItemGroup>
     <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
   </Target>

From da272cb6401d5bcb001faaf5e802013cbb3bec0a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 15:18:06 -0500
Subject: [PATCH 4/9] Add Controls.Input to meta package

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 268213c7f2c..b6511b4f19c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -13,6 +13,7 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
   </ItemGroup>
   
   <!--
@@ -31,12 +32,14 @@
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Input.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Input\'))" />
     </ItemGroup>
     <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
   </Target>

From 14df8de9865abf7fa61fc13b56c9486e1d9d5045 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 16:16:04 -0500
Subject: [PATCH 5/9] Added meta package smoke test

---
 .../MainPage.xaml                                  | 12 ++++++++++++
 .../MainPage.xaml.cs                               | 14 ++++++++++++++
 SmokeTests/SmokeTest.csproj                        |  2 +-
 SmokeTests/SmokeTests.proj                         |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
new file mode 100644
index 00000000000..2ad0f30edd2
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
@@ -0,0 +1,12 @@
+<Page x:Class="SmokeTest.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid>
+        <controls:Loading/>
+    </Grid>
+</Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
@@ -0,0 +1,14 @@
+// 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 SmokeTest
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 065f2d84af3..3b481d98be5 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -4,7 +4,7 @@
   <!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
   <PropertyGroup Condition="'$(CurrentProject)' == ''">
     <!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
-    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls.Core</CurrentProject>
+    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
     <NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index aa028c5375b..dcd2c11e3e0 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -19,6 +19,7 @@
       Microsoft.Toolkit.Uwp.UI;
       Microsoft.Toolkit.Uwp.UI.Animations;
       Microsoft.Toolkit.Uwp.UI.Behaviors;
+      Microsoft.Toolkit.Uwp.UI.Controls;
       Microsoft.Toolkit.Uwp.UI.Controls.Core;
       Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
       Microsoft.Toolkit.Uwp.UI.Controls.Layout;

From 248274540a9944eaf894e1571a267a558ae298ba Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 9 Feb 2021 13:50:23 -0500
Subject: [PATCH 6/9] Remove UI.Controls project build output from package Only
 include depedencies in package.

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index b6511b4f19c..d6b7cd2b745 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -4,6 +4,7 @@
     <Title>Windows Community Toolkit Controls</Title>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>

From 70928b4821619869a16d3ef11c06123085d39475 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 10 Feb 2021 11:30:54 -0500
Subject: [PATCH 7/9] Remove custom RemoveUnwantedPri build target, not needed

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index d6b7cd2b745..53e3bd2f6c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -16,32 +16,4 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
   </ItemGroup>
-  
-  <!--
-    Required workaround for ProjectReference inclusion of the Controls package
-    The UWP project system is including the Controls resources in the pri file because 
-    it doesn't know it'll be an independent package later during packing.
-    Therefore, we need to remove these extra resources in the PRI pipeline so the 
-    Markdown pri file is properly generated and doesn't include duplicate references to Control resources.
-  -->
-  <Target Name="RemoveUnwantedPri" AfterTargets="GetPackagingOutputs">
-    <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
-    <ItemGroup>
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Primitives.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Media.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Input.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Input\'))" />
-    </ItemGroup>
-    <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
-  </Target>
 </Project>

From 61c08f2764e7df56babc678e433c020a791b511b Mon Sep 17 00:00:00 2001
From: Rosario Pulella <Rosariopulella@gmail.com>
Date: Thu, 11 Feb 2021 16:49:20 -0500
Subject: [PATCH 8/9] Remove `EnableTypeInfoReflection`

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 53e3bd2f6c4..0ab3e6fa898 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Controls</Title>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
-    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

From ae3c91474ac9eaedf5c7ab7acf0a24d841267315 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <Rosariopulella@gmail.com>
Date: Thu, 11 Feb 2021 16:49:56 -0500
Subject: [PATCH 9/9] Remove `EnableTypeInfoReflection` comment

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 0ab3e6fa898..598a2c37390 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Controls</Title>
-    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>