diff --git a/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.csproj b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.csproj
new file mode 100644
index 00000000..e5457223
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.csproj
@@ -0,0 +1,58 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFrameworks>net462;netcoreapp3.0</TargetFrameworks>
+    <RootNamespace>Microsoft.Toolkit.Win32.SDK.Tasks</RootNamespace>
+    <AssemblyName>Microsoft.Toolkit.Win32.Tasks</AssemblyName>
+    <Title>Windows Community Toolkit Tools for XAML Islands</Title>
+    <Description>This library provides XAML islands common helpers applications. It is part of the Windows Community Toolkit.</Description>
+    <PackageTags>XAML Islands Tools</PackageTags>
+    <PackageId>Microsoft.Toolkit.Win32.UI.SDK</PackageId>
+    <Platforms>AnyCPU</Platforms>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <IsNativeProject>true</IsNativeProject>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IsTool>true</IsTool>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="..\Microsoft.WinRT.Win32.targets">
+      <Pack>true</Pack>
+      <PackagePath>build</PackagePath>
+    </Content>
+
+    <Content Include="Microsoft.Toolkit.Win32.UI.SDK.props">
+      <Pack>true</Pack>
+      <PackagePath>build</PackagePath>
+    </Content>
+
+    <Content Include="Microsoft.Toolkit.Win32.UI.SDK.targets">
+      <Pack>true</Pack>
+      <PackagePath>build</PackagePath>
+    </Content>
+
+    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\mt.exe">
+      <Pack>true</Pack>
+      <PackagePath>tools</PackagePath>
+    </Content>
+    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\mt.exe.config">
+      <Pack>true</Pack>
+      <PackagePath>tools</PackagePath>
+    </Content>
+    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\midlrtmd.dll">
+      <Pack>true</Pack>
+      <PackagePath>tools</PackagePath>
+    </Content>
+
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.0-rc">
+      <PrivateAssets>analyzers</PrivateAssets>
+    </PackageReference>
+    <ProjectReference Include="..\Microsoft.Toolkit.Win32.UI.XamlApplication.Package\Microsoft.Toolkit.Win32.UI.XamlApplication.Package.csproj">
+      <PrivateAssets>analyzers</PrivateAssets>
+    </ProjectReference>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.props b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.props
new file mode 100644
index 00000000..f1629d29
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.props
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.targets b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.targets
new file mode 100644
index 00000000..1b127586
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.UI.Tools/Microsoft.Toolkit.Win32.UI.SDK.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Microsoft.WinRT.Win32.targets" />
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.UI.XamlHost.targets b/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.UI.XamlHost.targets
index 77ae0ff1..f1629d29 100644
--- a/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.UI.XamlHost.targets
+++ b/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.UI.XamlHost.targets
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="Microsoft.WinRT.Win32.targets" />
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.Win32.UI.XamlHost.Managed.csproj b/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.Win32.UI.XamlHost.Managed.csproj
index d5e020ee..42df747b 100644
--- a/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.Win32.UI.XamlHost.Managed.csproj
+++ b/Microsoft.Toolkit.Win32.UI.XamlHost/Microsoft.Toolkit.Win32.UI.XamlHost.Managed.csproj
@@ -12,10 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\Microsoft.WinRT.Win32.targets">
-      <Pack>true</Pack>
-      <PackagePath>build</PackagePath>
-    </Content>
 
     <Content Include="Microsoft.Toolkit.UI.XamlHost.props">
       <Pack>true</Pack>
@@ -27,22 +23,12 @@
       <PackagePath>build</PackagePath>
     </Content>
 
-    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\mt.exe">
-      <Pack>true</Pack>
-      <PackagePath>tools</PackagePath>
-    </Content>
-    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\mt.exe.config">
-      <Pack>true</Pack>
-      <PackagePath>tools</PackagePath>
-    </Content>
-    <Content Include="$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.$(DefaultTargetPlatformVersion).0\x86\midlrtmd.dll">
-      <Pack>true</Pack>
-      <PackagePath>tools</PackagePath>
-    </Content>
-
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Win32.UI.Tools\Microsoft.Toolkit.Win32.UI.SDK.csproj" >
+      <PrivateAssets>analyzers</PrivateAssets>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Win32.UI.XamlApplication.Package\Microsoft.Toolkit.Win32.UI.XamlApplication.Package.csproj">
       <PrivateAssets>analyzers</PrivateAssets>
     </ProjectReference>
diff --git a/Microsoft.Toolkit.Win32.sln b/Microsoft.Toolkit.Win32.sln
index 4f8383a1..1cfd0b5d 100644
--- a/Microsoft.Toolkit.Win32.sln
+++ b/Microsoft.Toolkit.Win32.sln
@@ -64,6 +64,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Win32.UI.
 		{015A0047-772D-4F1A-88C9-45C18F0ADFB6} = {015A0047-772D-4F1A-88C9-45C18F0ADFB6}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Win32.UI.SDK", "Microsoft.Toolkit.Win32.UI.Tools\Microsoft.Toolkit.Win32.UI.SDK.csproj", "{955EF618-DB95-4AF7-83C3-7CAC44543D90}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -286,6 +288,22 @@ Global
 		{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x64.Build.0 = Release|Any CPU
 		{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x86.ActiveCfg = Release|Any CPU
 		{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x86.Build.0 = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM.Build.0 = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x64.Build.0 = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x86.Build.0 = Debug|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM.ActiveCfg = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM.Build.0 = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM64.Build.0 = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x64.ActiveCfg = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x64.Build.0 = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x86.ActiveCfg = Release|Any CPU
+		{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Microsoft.WinRT.Win32.targets b/Microsoft.WinRT.Win32.targets
index c48b0c25..0739723a 100644
--- a/Microsoft.WinRT.Win32.targets
+++ b/Microsoft.WinRT.Win32.targets
@@ -104,6 +104,7 @@
             var sb = new StringBuilder();
             sb.Append(headerF);
 
+            bool foundXamlHost = false;
             if (!string.IsNullOrEmpty(AppxManifest))
             {
                 XmlDocument doc = new XmlDocument();
@@ -116,6 +117,10 @@
                 {
                     var dllPathNode = winRTFactory.SelectSingleNode("./m:Path", nsmgr);
                     var dllPath = dllPathNode.InnerText;
+                    if (!foundXamlHost)
+                    {
+                      foundXamlHost = String.Compare(dllPath, "Microsoft.Toolkit.Win32.UI.XamlHost.dll", true) == 0;
+                    }
                     var typesNames = winRTFactory.SelectNodes("./m:ActivatableClass", nsmgr).OfType<XmlNode>();
                     var xmlHeader = String.Format(@"    <asmv3:file name='{0}'>", dllPath);
                     sb.Append(xmlHeader);
@@ -140,7 +145,7 @@
                     sb.Append(xmlFooter);
                 }
             }
-            else
+            if (!foundXamlHost)
             {
                 sb.Append(@"
     <asmv3:file name='Microsoft.Toolkit.Win32.UI.XamlHost.dll'>