UWP Required Build Changes

Author: michael-hawker

Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj

@@ -13,18 +13,16 @@
       - PeoplePicker: The PeoplePicker Control is a simple control that allows for selection of one or more users.
     </Description>
     <PackageTags>UWP Toolkit Windows Controls MSAL Microsoft Graph AadLogin ProfileCard Person PeoplePicker Login</PackageTags>
+    <SignAssembly>false</SignAssembly>
 
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Assets\folder.svg" />
-    <Content Include="Assets\genericfile.png" />
     <Content Include="Assets\person.png" />
-    <Content Include="Assets\photo.png" />
   </ItemGroup> 
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="5.1.1" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.0.0-build.14" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
   </ItemGroup>
 
@@ -43,8 +41,9 @@
     </Page>
   </ItemGroup>
 
+  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
-  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2" Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299'">
+  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
     <ItemGroup>
       <GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
     </ItemGroup>

Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Title>Windows Community Toolkit .NET Standard Graph Helpers</Title>
-    <PackageId>Microsoft.Toolkit.Graph</PackageId>
+    <TargetFrameworks>uap10.0.16299;netstandard2.0</TargetFrameworks>
+    <Title>Windows Community Toolkit .NET Standard Services</Title>
     <Description>
       This package includes .NET Standard code helpers such as:
       - GraphExtensions: Helpers for common tasks related to the Microsoft Graph used by the Microsoft.Toolkit.Graph.Controls.
@@ -14,7 +13,11 @@
     <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
     <DebugType>Full</DebugType>
   </PropertyGroup>
-  
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+    <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph" Version="1.17.0" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.1" />

Windows-Toolkit-Graph-Controls.sln

@@ -121,20 +121,10 @@ Global
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x86.Build.0 = Debug|x86
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x86.Deploy.0 = Debug|x86
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|Any CPU.ActiveCfg = Release|x64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|Any CPU.Build.0 = Release|x64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|Any CPU.Deploy.0 = Release|x64
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.ActiveCfg = Release|ARM
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.Build.0 = Release|ARM
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.Deploy.0 = Release|ARM
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.ActiveCfg = Release|ARM64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.Build.0 = Release|ARM64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.Deploy.0 = Release|ARM64
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x64.ActiveCfg = Release|x64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x64.Build.0 = Release|x64
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x64.Deploy.0 = Release|x64
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x86.ActiveCfg = Release|x86
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x86.Build.0 = Release|x86
-		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x86.Deploy.0 = Release|x86
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|Any CPU.ActiveCfg = Release|x86
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.ActiveCfg = Release|ARM
 		{26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.Build.0 = Release|ARM