Updated to new version of WinUI.

Author: azchohfi

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

@@ -18,25 +18,17 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
-    <!--<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />-->
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.49.g8695d221eb" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.49.g8695d221eb" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.52.g07f4dd1bd0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.52.g07f4dd1bd0" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
     <PackageReference Include="Microsoft.WinUI">
-      <Version>3.0.0-preview2.200701.0-CI</Version>
+      <Version>3.0.0-preview2.200707.3-CI</Version>
     </PackageReference>
   </ItemGroup>
 
-  <!-- Temporary fix to a bug in WinUI3 -->
-  <Target Name="RemoveXrXmlFilesFromOutputItems2" AfterTargets="AddPriPayloadFilesToCopyToOutputDirectoryItems" Condition="'$(UsingMicrosoftNETSdk)'=='true'">
-    <ItemGroup>
-      <_AllChildProjectItemsWithTargetPath Remove="@(_AllChildProjectItemsWithTargetPath)" Condition="$([System.String]::new('%(Identity)').EndsWith('.xr.xml'))"/>
-    </ItemGroup>
-  </Target>
- 
   <ItemGroup>
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>

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

@@ -14,6 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph.Beta" Version="0.18.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
-    <PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.49.g8695d221eb" />
+    <PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.52.g07f4dd1bd0" />
   </ItemGroup>
 </Project>

SampleTest.Package/SampleTest.Package.wapproj

@@ -32,6 +32,7 @@
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
     <EntryPointProjectUniqueName>..\SampleTest\SampleTest.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <ItemGroup>
@@ -59,16 +60,5 @@
     <SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <PropertyGroup>
-    <AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
-    <EntryPointProjectUniqueName>..\SampleTest\SampleTest.csproj</EntryPointProjectUniqueName>
-  </PropertyGroup>
-  
-  <!-- Temporary fix to a bug in WinUI3 -->
-  <Target Name="_RemoveXrXmlFromPayload" AfterTargets="_CalculateInputsForGenerateAppxPackageRecipe" Condition="'$(MSBuildProjectExtension)' == '.wapproj'">
-    <ItemGroup>
-      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="$([System.String]::new('%(Identity)').EndsWith('.xr.xml'))"/>
-    </ItemGroup>
-  </Target>
   <Import Project="$(AppxTargetsLocation)Microsoft.WinUI.AppX.targets" />
 </Project>

SampleTest.Package/build/Microsoft.WinUI.AppX.targets

@@ -166,5 +166,17 @@
       </UploadWapProjPackageFile>
     </ItemGroup>
   </Target>
+
+  <!--
+    Workaround for bug https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1149545
+    
+    The appx packaging tasks default to including the .xr.xml file (which is for using reflection in .NET Native) when consuming nuget packages. Since
+    we aren't using .NET Native, we don't need these anymore.
+  -->
+  <Target Name="_RemoveXrXmlFromPayload" AfterTargets="_CalculateInputsForGenerateAppxPackageRecipe" Condition="'$(MSBuildProjectExtension)' == '.wapproj'">
+    <ItemGroup>
+      <AppxPackagePayload Remove="@(AppxPackagePayload)" Condition="$([System.String]::new('%(Identity)').EndsWith('.xr.xml'))"/>
+    </ItemGroup>
+  </Target>
 </Project>
 

SampleTest/SampleTest.csproj

@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.WinUI">
-      <Version>3.0.0-preview2.200701.0-CI</Version>
+      <Version>3.0.0-preview2.200707.3-CI</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />